PB-2315: fix readiness check - #patch

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)