From 1d4536f3f149b16cdc9ef243f44159d84c688826 Mon Sep 17 00:00:00 2001
From: Francesco Bartoli <francesco.bartoli@geobeyond.it>
Date: Tue, 30 Jun 2020 20:41:47 +0200
Subject: [PATCH] Fix travis (#476)

* Fix csv ogr test

* Fix ogr wfs test from complex geojson
---
 pygeoapi/provider/ogr.py       | 9 +++++++--
 tests/test_ogr_csv_provider.py | 2 +-
 tests/test_ogr_wfs_provider.py | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pygeoapi/provider/ogr.py b/pygeoapi/provider/ogr.py
index 5407bcf..b8c16f5 100644
--- a/pygeoapi/provider/ogr.py
+++ b/pygeoapi/provider/ogr.py
@@ -427,6 +427,10 @@ class OGRProvider(BaseProvider):
 
     def _get_next_feature(self, layer, feature_id):
         try:
+            if layer.GetFeatureCount() == 0:
+                LOGGER.error("item {} is not found".format(feature_id))
+                raise ProviderItemNotFoundError(
+                    "item {} not found".format(feature_id))
             # Ignore gdal error
             next_feature = _ignore_gdal_error(layer, 'GetNextFeature')
             if next_feature:
@@ -436,8 +440,9 @@ class OGRProvider(BaseProvider):
                         "Object properties are all null"
                     )
             else:
-                raise ProviderItemNotFoundError(
-                    "item {} not found".format(feature_id))
+                raise RuntimeError(
+                    "GDAL has returned a null feature for item {}".format(
+                        feature_id))
             return next_feature
         except RuntimeError as gdalerr:
             LOGGER.error(self.gdal.GetLastErrorMsg())
diff --git a/tests/test_ogr_csv_provider.py b/tests/test_ogr_csv_provider.py
index 6a5b88b..665a8a5 100644
--- a/tests/test_ogr_csv_provider.py
+++ b/tests/test_ogr_csv_provider.py
@@ -85,7 +85,7 @@ def test_get_vsicurl(config_vsicurl_csv):
     p = OGRProvider(config_vsicurl_csv)
     result = p.get('32')
     assert result['id'] == 32
-    assert '11' in result['properties']['codice_regione']
+    assert '14' in result['properties']['codice_regione']
 
 
 def test_get_not_existing_feature_raise_exception(
diff --git a/tests/test_ogr_wfs_provider.py b/tests/test_ogr_wfs_provider.py
index be28484..b6a234d 100644
--- a/tests/test_ogr_wfs_provider.py
+++ b/tests/test_ogr_wfs_provider.py
@@ -137,7 +137,7 @@ def config_geonode_gs_WFS():
         'data': {
             'source_type': 'WFS',
             'source':
-                'WFS:https://geonode.wfp.org/geoserver/wfs?',
+                'WFS:https://geonode.wfp.org/geoserver/wfs',
             'source_srs': 'EPSG:4326',
             'target_srs': 'EPSG:4326',
             'source_capabilities': {