MapProxy 2.2.0__tar.gz → 3.0.1__tar.gz

{MapProxy-2.2.0 → MapProxy-3.0.1}/CHANGES.txt

@@ -1,3 +1,35 @@
+3.0.1 2024-08-27
+~~~~~~~~~~~~~~~~
+
+Fixes:
+
+  - Fix capabilities links in demo page and config template
+  - Trivy report format
+
+
+3.0.0 2024-08-27
+~~~~~~~~~~~~~~~~
+
+Breaking:
+
+  - Add proper XML Exception when service parameter disabled / invalid or missing
+    In the past MapProxy returned WMS Capabilities when no explicit service parameter was given in
+    GetCapabilities requests. With this change, an OGC exception will be returned instead.
+    Invalid service types now also return a proper exception instead of an `internal error`.
+    Besides, the status code of exception responses now have a 400 or 500 code instead of 200
+    for better conformity.
+
+Maintenance:
+
+  - Add test for seeding sqlite cache
+  - Documentation updates and clarifications
+  - Dependency updates
+
+Fixes:
+
+  - Fix gh-pages workflow
+
+
 2.2.0 2024-07-24
 ~~~~~~~~~~~~~~~~
 

{MapProxy-2.2.0 → MapProxy-3.0.1}/MapProxy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MapProxy
-Version: 2.2.0
+Version: 3.0.1
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -34,6 +34,38 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+3.0.1 2024-08-27
+~~~~~~~~~~~~~~~~
+
+Fixes:
+
+  - Fix capabilities links in demo page and config template
+  - Trivy report format
+
+
+3.0.0 2024-08-27
+~~~~~~~~~~~~~~~~
+
+Breaking:
+
+  - Add proper XML Exception when service parameter disabled / invalid or missing
+    In the past MapProxy returned WMS Capabilities when no explicit service parameter was given in
+    GetCapabilities requests. With this change, an OGC exception will be returned instead.
+    Invalid service types now also return a proper exception instead of an `internal error`.
+    Besides, the status code of exception responses now have a 400 or 500 code instead of 200
+    for better conformity.
+
+Maintenance:
+
+  - Add test for seeding sqlite cache
+  - Documentation updates and clarifications
+  - Dependency updates
+
+Fixes:
+
+  - Fix gh-pages workflow
+
+
 2.2.0 2024-07-24
 ~~~~~~~~~~~~~~~~
 
@@ -114,53 +146,6 @@ Fixes:
 - Fix mixed image format for file, S3 and azureblob caches
 
 
-2.0.0 2023-12-19
-~~~~~~~~~~~~~~~~~
-Breaking:
-
-- Removal of old unsupported python versions 3.7
-- Tested python version range is now 3.8 to 3.11
-- Lots of dependency updates
-
-Improvements:
-
-- Add S3 performance option to request via urllib2
-- Allow md5 calls to work in FIPS environments
-- Several Redis Cache enhancements
-- Coverage support for caches
-
-Fixes:
-
-- Configure image options for caches (fixes erratically white tiles when requesting multiple cached layers)
-- Fix for Legends in JSON Format
-- Some more minor fixups
-
-
-1.16.0 2023-04-13
-~~~~~~~~~~~~~~~~~
-Breaking:
-
-- Removal of old unsupported python versions 2.7 and 3.6
-- Tested python version range is now 3.7 to 3.11
-- Lots of dependency updates
-
-Improvements:
-
-- New cache: Azure Blob storage
-- Lots of dependency updates
-- Support for JSON legends
-- Updated layer preview to use latest openlayers
-- Official docker images released, documentation updated
-
-Fixes:
-
-- Fixed issues with sqlite cache (#629 and #625)
-- Dependency correction
-- library detection difficulties on some operating systems
-- encoding issues with umlauts in featureinfo
-- Several minor bugfixes
-- mapproxy-util export - derive image format from cache config
-
 
 Older changes
 -------------

{MapProxy-2.2.0 → MapProxy-3.0.1}/MapProxy.egg-info/SOURCES.txt

@@ -167,6 +167,7 @@ mapproxy/service/template_helper.py
 mapproxy/service/tile.py
 mapproxy/service/wms.py
 mapproxy/service/wmts.py
+mapproxy/service/templates/ows_exception.xml
 mapproxy/service/templates/tms_capabilities.xml
 mapproxy/service/templates/tms_exception.xml
 mapproxy/service/templates/tms_root_resource.xml

{MapProxy-2.2.0 → MapProxy-3.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MapProxy
-Version: 2.2.0
+Version: 3.0.1
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -34,6 +34,38 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+3.0.1 2024-08-27
+~~~~~~~~~~~~~~~~
+
+Fixes:
+
+  - Fix capabilities links in demo page and config template
+  - Trivy report format
+
+
+3.0.0 2024-08-27
+~~~~~~~~~~~~~~~~
+
+Breaking:
+
+  - Add proper XML Exception when service parameter disabled / invalid or missing
+    In the past MapProxy returned WMS Capabilities when no explicit service parameter was given in
+    GetCapabilities requests. With this change, an OGC exception will be returned instead.
+    Invalid service types now also return a proper exception instead of an `internal error`.
+    Besides, the status code of exception responses now have a 400 or 500 code instead of 200
+    for better conformity.
+
+Maintenance:
+
+  - Add test for seeding sqlite cache
+  - Documentation updates and clarifications
+  - Dependency updates
+
+Fixes:
+
+  - Fix gh-pages workflow
+
+
 2.2.0 2024-07-24
 ~~~~~~~~~~~~~~~~
 
@@ -114,53 +146,6 @@ Fixes:
 - Fix mixed image format for file, S3 and azureblob caches
 
 
-2.0.0 2023-12-19
-~~~~~~~~~~~~~~~~~
-Breaking:
-
-- Removal of old unsupported python versions 3.7
-- Tested python version range is now 3.8 to 3.11
-- Lots of dependency updates
-
-Improvements:
-
-- Add S3 performance option to request via urllib2
-- Allow md5 calls to work in FIPS environments
-- Several Redis Cache enhancements
-- Coverage support for caches
-
-Fixes:
-
-- Configure image options for caches (fixes erratically white tiles when requesting multiple cached layers)
-- Fix for Legends in JSON Format
-- Some more minor fixups
-
-
-1.16.0 2023-04-13
-~~~~~~~~~~~~~~~~~
-Breaking:
-
-- Removal of old unsupported python versions 2.7 and 3.6
-- Tested python version range is now 3.7 to 3.11
-- Lots of dependency updates
-
-Improvements:
-
-- New cache: Azure Blob storage
-- Lots of dependency updates
-- Support for JSON legends
-- Updated layer preview to use latest openlayers
-- Official docker images released, documentation updated
-
-Fixes:
-
-- Fixed issues with sqlite cache (#629 and #625)
-- Dependency correction
-- library detection difficulties on some operating systems
-- encoding issues with umlauts in featureinfo
-- Several minor bugfixes
-- mapproxy-util export - derive image format from cache config
-
 
 Older changes
 -------------

{MapProxy-2.2.0 → MapProxy-3.0.1}/doc/caches.rst

@@ -513,7 +513,7 @@ Available options:
   When set to ``true``, requests to S3 ``GetObject`` will be fetched via urllib2 instead of boto, which decreases response times. Defaults to ``false``.
 
 .. note::
-  The hierarchical ``directory_layouts`` can hit limitations of S3 *"if you are routinely processing 100 or more requests per second"*. ``directory_layout: reverse_tms`` can work around this limitation. Please read `S3 Request Rate and Performance Considerations <http://docs.aws.amazon.com/AmazonS3/latest/dev/request-rate-perf-considerations.html>`_ for more information on this issue.
+  The hierarchical ``directory_layouts`` can hit limitations of AWS S3 if you are routinely processing 3500 or more requests per second. ``directory_layout: reverse_tms`` can work around this limitation. Please read `S3 Request Rate and Performance Considerations <http://docs.aws.amazon.com/AmazonS3/latest/dev/request-rate-perf-considerations.html>`_ for more information on this issue.
 
 Example
 -------

{MapProxy-2.2.0 → MapProxy-3.0.1}/doc/configuration.rst

@@ -664,13 +664,13 @@ Example:
 
 .. code-block:: yaml
 
-   caches:
-     osm_cache:
-     grids: ['osm_grid']
-     sources: [OSM]
-     disable_storage: false
-     refresh_before:
-       days: 1
+  caches:
+    osm_cache:
+      grids: ['osm_grid']
+      sources: [OSM]
+      disable_storage: false
+      refresh_before:
+        days: 1
 
 
 ``disable_storage``
@@ -685,7 +685,7 @@ even if the there are matching tiles in the cache. See :ref:`seed_only <wms_seed
 """""""""""""
 
 Directory where MapProxy should store tiles for this cache. Uses the value of ``globals.cache.base_dir`` by default. MapProxy will store each cache in a subdirectory named after the cache and the grid SRS (e.g. ``cachename_EPSG1234``).
-See :ref:`directory option<cache_file_directory>` on how configure a complete path.
+See :ref:`directory option<cache_file_directory>` on how to configure a complete path.
 
 ``cache``
 """""""""
@@ -1004,7 +1004,7 @@ The following options define how tiles are created and stored. Most options can
 .. _meta_size:
 
 ``meta_size``
-  MapProxy does not make a single request for every tile it needs, but it will request a large meta-tile that consist of multiple tiles. ``meta_size`` defines how large a meta-tile is. A ``meta_size`` of ``[4, 4]`` will request 16 tiles in one pass. With a tile size of 256x256 this will result in 1024x1024 requests to the source. Tiled sources are still requested tile by tile, but you can configure MapProxy to load multiple tiles in bulk with ``bulk_meta_tiles``.
+  MapProxy does not make a single request for every tile it needs, but it will request a large meta-tile that consist of multiple tiles. ``meta_size`` defines how large a meta-tile is. A ``meta_size`` of ``[4, 4]`` will request 16 tiles in one pass. With a tile size of 256x256 and 0 ``meta_buffer``, this will result in 1024x1024 requests to the source. (Note that the default value for ``meta_buffer`` is 80.) Tiled sources are still requested tile by tile, but you can configure MapProxy to load multiple tiles in bulk with ``bulk_meta_tiles``.
 
 
 .. _bulk_meta_tiles:
@@ -1017,7 +1017,7 @@ The following options define how tiles are created and stored. Most options can
 ``meta_buffer``
   MapProxy will increase the size of each meta-tile request by this number of
   pixels in each direction. This can solve cases where labels are cut-off at
-  the edge of tiles.
+  the edge of tiles. Defaults to 80.
 
 ``base_dir``
   The base directory where all cached tiles will be stored. The path can

{MapProxy-2.2.0 → MapProxy-3.0.1}/mapproxy/config/loader.py

@@ -24,6 +24,7 @@ from mapproxy.util.py import memoize
 from mapproxy.config.spec import validate_options, add_source_to_mapproxy_yaml_spec, add_service_to_mapproxy_yaml_spec
 from mapproxy.config.validator import validate
 from mapproxy.config import load_default_config, finish_base_config, defaults
+from mapproxy.service.ows import OWSServer
 
 import os
 import sys
@@ -2063,9 +2064,7 @@ class ServiceConfiguration(ConfigurationBase):
                 else:
                     services.append(new_service)
 
-        if ows_services:
-            from mapproxy.service.ows import OWSServer
-            services.append(OWSServer(ows_services))
+        services.append(OWSServer(ows_services))
         return services
 
     def tile_layers(self, conf, use_grid_names=False):

{MapProxy-2.2.0 → MapProxy-3.0.1}/mapproxy/config_template/base_config/mapproxy.yaml

@@ -10,7 +10,7 @@
 # Demo:
 #     http://localhost:8080/demo
 # WMS:
-#     capabilities: http://localhost:8080/service?REQUEST=GetCapabilities
+#     capabilities: http://localhost:8080/service?REQUEST=GetCapabilities&SERVICE=WMS
 # WMTS:
 #     capabilities: http://localhost:8080/wmts/1.0.0/WMTSCapabilities.xml
 #     first tile: http://localhost:8080/wmts/osm/webmercator/0/0/0.png

{MapProxy-2.2.0 → MapProxy-3.0.1}/mapproxy/exception.py

@@ -19,6 +19,9 @@ Service exception handling (WMS exceptions, XML, in_image, etc.).
 from html import escape
 
 from mapproxy.response import Response
+from mapproxy.template import template_loader
+import mapproxy.service
+get_template = template_loader(mapproxy.service.__package__, 'templates')
 
 
 class RequestError(Exception):
@@ -29,13 +32,14 @@ class RequestError(Exception):
                     was valid (e.g. the source server is unreachable
     """
 
-    def __init__(self, message, code=None, request=None, internal=False, status=None):
+    def __init__(self, message, code=None, request=None, internal=False, status=None, locator=None):
         Exception.__init__(self, message)
         self.msg = message
         self.code = code
         self.request = request
         self.internal = internal
         self.status = status
+        self.locator = locator
 
     def render(self):
         """
@@ -93,7 +97,7 @@ class XMLExceptionHandler(ExceptionHandler):
     The content_type is sent as defined here.
     """
 
-    status_code = 200
+    status_code = 500
     """
     The HTTP status code.
     """
@@ -122,7 +126,11 @@ class XMLExceptionHandler(ExceptionHandler):
 
         :type request_error: `RequestError`
         """
-        status_code = self.status_codes.get(request_error.code, self.status_code)
+        if request_error.status is not None:
+            status_code = request_error.status
+        else:
+            status_code = self.status_codes.get(request_error.code, self.status_code)
+
         # escape &<> in error message (e.g. URL params)
         msg = escape(request_error.msg)
         result = self.template.substitute(exception=msg,
@@ -138,6 +146,34 @@ class XMLExceptionHandler(ExceptionHandler):
         return self.template_func(self.template_file)
 
 
+class OWSExceptionHandler(XMLExceptionHandler):
+    """
+    Exception handler for generic OWS ServiceExceptionReports
+    """
+    template_file = 'ows_exception.xml'
+    template_func = get_template
+    mimetype = 'text/xml'
+
+    def render(self, request_error):
+        """
+        Render the template of this exception handler. Passes the
+        ``request_error.msg``, ``request_error.locator`` and ``request_error.code`` to the template.
+
+        :type request_error: `RequestError`
+        """
+        if request_error.status is not None:
+            status_code = request_error.status
+        else:
+            status_code = self.status_codes.get(request_error.code, self.status_code)
+
+        # escape &<> in error message (e.g. URL params)
+        msg = escape(request_error.msg)
+        result = self.template.substitute(exception=msg,
+                                          code=request_error.code, locator=request_error.locator)
+        return Response(result, mimetype=self.mimetype, content_type=self.content_type,
+                        status=status_code)
+
+
 class PlainExceptionHandler(ExceptionHandler):
     mimetype = 'text/plain'
     status_code = 404

{MapProxy-2.2.0 → MapProxy-3.0.1}/mapproxy/service/demo.py

@@ -138,7 +138,7 @@ class DemoServer(Server):
         elif 'wmts_layer' in req.args:
             demo = self._render_wmts_template('demo/wmts_demo.html', req)
         elif 'wms_capabilities' in req.args:
-            internal_url = '%s/service?REQUEST=GetCapabilities' % (req.server_script_url)
+            internal_url = '%s/service?REQUEST=GetCapabilities&SERVICE=WMS' % (req.server_script_url)
             if 'type' in req.args and req.args['type'] == 'external':
                 url = internal_url.replace(req.server_script_url, req.script_url)
             else:
@@ -146,7 +146,7 @@ class DemoServer(Server):
             capabilities = urllib2.urlopen(url)
             demo = self._render_capabilities_template('demo/capabilities_demo.html', capabilities, 'WMS', url)
         elif 'wmsc_capabilities' in req.args:
-            internal_url = '%s/service?REQUEST=GetCapabilities&tiled=true' % (req.server_script_url)
+            internal_url = '%s/service?REQUEST=GetCapabilities&SERVICE=WMS&tiled=true' % (req.server_script_url)
             if 'type' in req.args and req.args['type'] == 'external':
                 url = internal_url.replace(req.server_script_url, req.script_url)
             else:

{MapProxy-2.2.0 → MapProxy-3.0.1}/mapproxy/service/ows.py

@@ -16,6 +16,7 @@
 """
 Wrapper service handler for all OWS services (/service?).
 """
+from mapproxy.exception import OWSExceptionHandler, RequestError
 
 
 class OWSServer(object):
@@ -33,7 +34,24 @@ class OWSServer(object):
             self.services[service.service] = service
 
     def handle(self, req):
-        service = req.args.get('service', 'wms').lower()
-        assert service in self.services
+        service = req.args.get('service')
+        wmtver = req.args.get('wmtver')
+        if not service:
+            if wmtver == '1.0.0':
+                # WMS version 1.0.0 did not have a mandatory service parameter
+                service = 'wms'
+            else:
+                req.exception_handler = OWSExceptionHandler()
+
+                error = RequestError('The service parameter is missing',
+                        code='MissingParameterValue', request=req, locator='service', status=400)
+                return req.exception_handler.render(error)
+
+        service = service.lower()
+        if service not in self.services:
+            req.exception_handler = OWSExceptionHandler()
+            error = RequestError('The value of the service parameter "' + str(service) + '" is invalid',
+                        code='InvalidParameterValue', request=req, locator='service', status=400)
+            return error.render()
 
         return self.services[service].handle(req)

{MapProxy-2.2.0 → MapProxy-3.0.1}/mapproxy/service/templates/demo/demo.html

@@ -35,7 +35,7 @@ jscript_openlayers=None
             {{if 'wms' in services}}
             <div class="capabilities">
                 <span>Capabilities document</span>
-                <span><a href="../service?REQUEST=GetCapabilities">(download as xml)</a></span>
+                <span><a href="../service?REQUEST=GetCapabilities&SERVICE=WMS">(download as xml)</a></span>
                 <span><a href="../demo/?wms_capabilities">(view as html, internal)</a></span>
                 <span><a href="../demo/?wms_capabilities&type=external">(view as html, external)</a></span>
             </div>
@@ -83,7 +83,7 @@ jscript_openlayers=None
             {{if 'wms' in services}}
             <div class="capabilities">
                 <span>Capabilities document</span>
-                <span><a href="../service?REQUEST=GetCapabilities&tiled=true">(download as xml)</a></span>
+                <span><a href="../service?REQUEST=GetCapabilities&SERVICE=WMS&tiled=true">(download as xml)</a></span>
                 <span><a href="../demo/?wmsc_capabilities">(view as html, internal)</a></span>
                 <span><a href="../demo/?wmsc_capabilities&type=external">(view as html, external)</a></span>
             </div>

MapProxy-3.0.1/mapproxy/service/templates/ows_exception.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<ows:ExceptionReport xmlns:ows="http://www.opengis.net/ows/1.1"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.opengis.net/ows/1.1 http://schemas.opengis.net/ows/1.1.0/owsExceptionReport.xsd"
+  version="1.0.0" xml:lang="en">
+  <ows:Exception{{if code is not None}} exceptionCode="{{code}}"{{endif}}
+     {{if locator is not None}} locator="{{locator}}"{{endif}}>
+    <ows:ExceptionText>{{exception}}</ows:ExceptionText>
+  </ows:Exception>
+</ows:ExceptionReport>

{MapProxy-2.2.0 → MapProxy-3.0.1}/mapproxy/test/system/fixture/seed.yaml

@@ -29,6 +29,11 @@ seeds:
     refresh_before:
       days: 1
 
+  sqlite_cache:
+    caches: [sqlite_cache]
+    grids: [GLOBAL_GEODETIC]
+    levels: [0]
+
   with_empty_coverage:
     caches: [mbtile_cache]
     grids: [GLOBAL_GEODETIC]
@@ -58,7 +63,7 @@ cleanups:
     levels: [1]
     remove_all: true
 
-  sqlite_cache:
+  cleanup_sqlite_cache:
     caches: [sqlite_cache]
     grids: [GLOBAL_GEODETIC]
     levels: [3]
@@ -91,4 +96,4 @@ cleanups:
     grids: [GLOBAL_GEODETIC]
     levels: [0]
     remove_before:
-      mtime: 'seed.yaml'
+      mtime: 'seed.yaml'

{MapProxy-2.2.0 → MapProxy-3.0.1}/mapproxy/test/system/test_demo.py

@@ -29,8 +29,8 @@ class TestDemo(SysTest):
     def test_basic(self, app):
         resp = app.get("/demo/", status=200)
         assert resp.content_type == "text/html"
-        assert 'href="../service?REQUEST=GetCapabilities"' in resp
-        assert 'href="../service?REQUEST=GetCapabilities&tiled=true"' in resp
+        assert 'href="../service?REQUEST=GetCapabilities&SERVICE=WMS"' in resp
+        assert 'href="../service?REQUEST=GetCapabilities&SERVICE=WMS&tiled=true"' in resp
         assert 'href="../demo/?wmts_layer=wms_cache&format=jpeg&srs=EPSG%3A900913"' in resp
         assert 'href="../demo/?tms_layer=wms_cache&format=jpeg&srs=EPSG%3A900913"' in resp
 

{MapProxy-2.2.0 → MapProxy-3.0.1}/mapproxy/test/system/test_demo_with_extra_service.py

@@ -45,8 +45,8 @@ class TestDemoWithExtraService(SysTest):
     def test_basic(self, app):
         resp = app.get("/demo/", status=200)
         assert resp.content_type == "text/html"
-        assert 'href="../service?REQUEST=GetCapabilities"' in resp
-        assert 'href="../service?REQUEST=GetCapabilities&tiled=true"' in resp
+        assert 'href="../service?REQUEST=GetCapabilities&SERVICE=WMS"' in resp
+        assert 'href="../service?REQUEST=GetCapabilities&SERVICE=WMS&tiled=true"' in resp
         assert 'href="../demo/?wmts_layer=wms_cache&format=jpeg&srs=EPSG%3A900913"' in resp
         assert 'href="../demo/?tms_layer=wms_cache&format=jpeg&srs=EPSG%3A900913"' in resp
         assert '<h2>My extra service</h2>' in resp

{MapProxy-2.2.0 → MapProxy-3.0.1}/mapproxy/test/system/test_legendgraphic.py

@@ -212,7 +212,7 @@ class TestWMSLegendgraphic(SysTest):
 
     def test_get_legendgraphic_no_legend_111(self, app):
         self.common_lg_req_111.params["layer"] = "wms_no_legend"
-        resp = app.get(self.common_lg_req_111)
+        resp = app.get(self.common_lg_req_111, expect_errors=True)
         assert resp.content_type == "application/vnd.ogc.se_xml"
         xml = resp.lxml
         assert (
@@ -227,7 +227,7 @@ class TestWMSLegendgraphic(SysTest):
             .replace("sld_version", "invalid")
             .replace("format", "invalid")
         )
-        resp = app.get(req)
+        resp = app.get(req, expect_errors=True)
         assert resp.content_type == "application/vnd.ogc.se_xml"
         xml = resp.lxml
         assert "missing parameters" in xml.xpath("//ServiceException/text()")[0]
@@ -237,7 +237,7 @@ class TestWMSLegendgraphic(SysTest):
         req = str(self.common_lg_req_111).replace(
             "sld_version=1.1.0", "sld_version=1.0.0"
         )
-        resp = app.get(req)
+        resp = app.get(req, expect_errors=True)
         assert resp.content_type == "application/vnd.ogc.se_xml"
         xml = resp.lxml
         assert "invalid sld_version" in xml.xpath("//ServiceException/text()")[0]
@@ -245,7 +245,7 @@ class TestWMSLegendgraphic(SysTest):
 
     def test_get_legendgraphic_no_legend_130(self, app):
         self.common_lg_req_130.params["layer"] = "wms_no_legend"
-        resp = app.get(self.common_lg_req_130)
+        resp = app.get(self.common_lg_req_130, expect_errors=True)
         assert resp.content_type == "text/xml"
         xml = resp.lxml
         assert_xpath_wms130(xml, "/ogc:ServiceExceptionReport/@version", "1.3.0")
@@ -258,7 +258,7 @@ class TestWMSLegendgraphic(SysTest):
 
     def test_get_legendgraphic_missing_params_130(self, app):
         req = str(self.common_lg_req_130).replace("format", "invalid")
-        resp = app.get(req)
+        resp = app.get(req, expect_errors=True)
         assert resp.content_type == "text/xml"
         xml = resp.lxml
         assert_xpath_wms130(xml, "/ogc:ServiceExceptionReport/@version", "1.3.0")
@@ -271,7 +271,7 @@ class TestWMSLegendgraphic(SysTest):
         req = str(self.common_lg_req_130).replace(
             "sld_version=1.1.0", "sld_version=1.0.0"
         )
-        resp = app.get(req)
+        resp = app.get(req, expect_errors=True)
         assert resp.content_type == "text/xml"
         xml = resp.lxml
         assert_xpath_wms130(xml, "/ogc:ServiceExceptionReport/@version", "1.3.0")

{MapProxy-2.2.0 → MapProxy-3.0.1}/mapproxy/test/system/test_renderd_client.py

@@ -179,14 +179,14 @@ class TestWMS111(SysTest):
 
         with mock_single_req_httpd(("localhost", 42423), req_handler):
             self.common_map_req.params["bbox"] = "0,0,9,9"
-            resp = app.get(self.common_map_req)
+            resp = app.get(self.common_map_req, expect_errors=True)
 
             assert resp.content_type == "application/vnd.ogc.se_xml"
             is_111_exception(resp.lxml, re_msg="Error from renderd: barf")
 
     def test_get_map_connection_error(self, app):
         self.common_map_req.params["bbox"] = "0,0,9,9"
-        resp = app.get(self.common_map_req)
+        resp = app.get(self.common_map_req, expect_errors=True)
 
         assert resp.content_type == "application/vnd.ogc.se_xml"
         is_111_exception(resp.lxml, re_msg="Error while communicating with renderd:")
@@ -210,7 +210,7 @@ class TestWMS111(SysTest):
 
         with mock_single_req_httpd(("localhost", 42423), req_handler):
             self.common_map_req.params["bbox"] = "0,0,9,9"
-            resp = app.get(self.common_map_req)
+            resp = app.get(self.common_map_req, expect_errors=True)
 
         assert resp.content_type == "application/vnd.ogc.se_xml"
         is_111_exception(

{MapProxy-2.2.0 → MapProxy-3.0.1}/mapproxy/test/system/test_response_headers.py

@@ -46,7 +46,7 @@ class TestResponseHeaders(SysTest):
         assert resp.vary == ('X-Script-Name', 'X-Forwarded-Host', 'X-Forwarded-Proto')
 
     def test_no_endpoint(self, app):
-        resp = app.get('http://localhost/service?')
+        resp = app.get('http://localhost/service?', expect_errors=True)
         assert resp.vary == ('X-Script-Name', 'X-Forwarded-Host', 'X-Forwarded-Proto')
 
     def test_image_response(self, app):