Master

app/helpers/wmts.py

@@ -53,7 +53,9 @@ def prepare_wmts_cached_response(s3_resp):
 
 def validate_wmts_mode():
     mode = request.args.get('mode', settings.DEFAULT_MODE)
-    supported_modes = ('default', 'preview')
+    supported_modes = ('default',) if settings.APP_STAGING == 'prod' else (
+        'default', 'preview'
+    )
     if mode not in supported_modes:
         msg = 'Unsupported mode: %s. Only "%s" are supported.'
         logger.error(msg, mode, ", ".join(supported_modes))

app/routes.py

@@ -71,17 +71,19 @@ def liveness():
 
 @app.route('/checker/ready', methods=['GET'])
 def readiness():
-    wms_ok_string = 'No query information to decode. ' + \
-                    'QUERY_STRING is set, but empty.\n'
+    wms_ok_marker = (
+        'No query information to decode. QUERY_STRING is set, but empty.'
+    )
 
     content = get_wms_backend_readiness()
 
-    if content.decode('ascii') != wms_ok_string:
+    content_str = content.decode('ascii', errors='replace')
+    if wms_ok_marker not in content_str:
         logger.error(
             'Incomprehensible WMS backend %s answer: %s. '
             'WMS is probably not ready yet.',
             settings.WMS_BACKEND_READY,
-            content.decode('ascii')
+            content_str
         )
         abort(503, 'Incomprehensible answer. WMS is probably not ready yet.')
     return make_response(jsonify({'success': True, 'message': 'OK'}))

tests/unit_tests/test_checker.py

@@ -39,3 +39,20 @@ def test_backend_checker_down(self, mock_get_backend):
         resp = self.app.get('/checker/ready')
         mock_get_backend.assert_called_once()
         self.assertEqual(resp.status_code, 502)
+
+    @patch('app.routes.get_wms_backend_readiness')
+    def test_backend_checker_ready(self, mock_readiness):
+        mock_readiness.return_value = (
+            b'No query information to decode. QUERY_STRING is set, but empty.'
+        )
+        resp = self.app.get('/checker/ready')
+        self.assertEqual(resp.status_code, 200)
+        self.assertEqual(resp.json, {'success': True, 'message': 'OK'})
+
+    @patch('app.routes.get_wms_backend_readiness')
+    def test_backend_checker_missing_marker(self, mock_readiness):
+        mock_readiness.return_value = (
+            b'<HTML><BODY>Apache is up but MapServer is not.</BODY></HTML>'
+        )
+        resp = self.app.get('/checker/ready')
+        self.assertEqual(resp.status_code, 503)

tests/unit_tests/test_get_tile.py

@@ -261,10 +261,11 @@ def test_wmts_out_of_bounds(self, mock_get_s3_file):
 
     def test_wmts_4326_unsupported_zoom(self, mock_get_s3_file):
         mock_get_s3_file.return_value = self.mock_get_s3_file_conn_nok
-        resp = self.app.get(
-            '1.0.0/inline_points/default/current/4326/18/273577/63352.png'
-            '?mode=preview'
-        )
+        with patch.object(settings, 'APP_STAGING', 'test'):
+            resp = self.app.get(
+                '1.0.0/inline_points/default/current/4326/18/273577/63352.png'
+                '?mode=preview'
+            )
         self.assertEqual(resp.status_code, 400)
         self.assertCacheControl(resp)
 
@@ -296,10 +297,11 @@ def test_wmts_png_preview_gutter(self, mock_wms, mock_get_s3_file):
         mock_get_s3_file.return_value = self.mock_get_s3_file_conn_ok
         self.get_wms_request_mock(mock_wms)
 
-        resp = self.app.get(
-            '/1.0.0/inline_points/' +
-            'default/current/21781/20/76/44.png?mode=preview'
-        )
+        with patch.object(settings, 'APP_STAGING', 'test'):
+            resp = self.app.get(
+                '/1.0.0/inline_points/' +
+                'default/current/21781/20/76/44.png?mode=preview'
+            )
         self.assertEqual(resp.status_code, 200)
         self.assertEqual(
             resp.headers['Cache-Control'],
@@ -477,10 +479,11 @@ def handle_2nd_level_cache_wrapper(*args, **kwargs):
             'app.helpers.wmts.handle_2nd_level_cache',
             wraps=handle_2nd_level_cache_wrapper
         ) as mock_handle_2nd_level_cache:
-            resp = self.app.get(
-                '/1.0.0/inline_points/default/current/21781/20/76/44.png'
-                '?mode=preview'
-            )
+            with patch.object(settings, 'APP_STAGING', 'test'):
+                resp = self.app.get(
+                    '/1.0.0/inline_points/default/current/21781/20/76/44.png'
+                    '?mode=preview'
+                )
             self.assertEqual(resp.status_code, 200)
             mock_handle_2nd_level_cache.assert_called()
         self.assertEqual(
@@ -507,9 +510,10 @@ def test_wmts_cadastral_wms_proxy_from_s3_cache_preview(
     ):
         mock_get_s3_file.return_value = self.mock_get_s3_file_conn_ok
 
-        resp = self.app.get(
-            '1.0.0/inline_points/default/current/2056/17/4/7.png?mode=preview'
-        )
+        with patch.object(settings, 'APP_STAGING', 'test'):
+            resp = self.app.get(
+                '1.0.0/inline_points/default/current/2056/17/4/7.png?mode=preview'
+            )
         self.assertEqual(resp.status_code, 200)
         self.assert2ndCacheHeader(resp, False)
 
@@ -584,9 +588,10 @@ def test_wmts_bad_content_type(self, mock_get_s3_file, mocker):
             headers={'Content-Type': 'text/xml; charset=UTF-8'}
         )
 
-        resp = self.app.get(
-            '/1.0.0/inline_points/' +
-            'default/current/21781/20/76/44.png?mode=preview'
-        )
+        with patch.object(settings, 'APP_STAGING', 'test'):
+            resp = self.app.get(
+                '/1.0.0/inline_points/' +
+                'default/current/21781/20/76/44.png?mode=preview'
+            )
         self.assertEqual(resp.status_code, 501)
         self.assertEqual(resp.headers['Cache-Control'], 'public, max-age=5')