fix(warm_up_cache): JSON serialization

john-bodley · john-bodley · commit 1e00f466daa8 · 2023-05-23T08:39:27.000-07:00
diff --git a/superset/views/core.py b/superset/views/core.py
@@ -132,6 +132,7 @@
 from superset.utils.cache import etag_cache
 from superset.utils.core import (
     apply_max_row_limit,
+    base_json_conv,
     DatasourceType,
     get_user_id,
     ReservedUrlParameters,
@@ -1821,7 +1822,7 @@ def warm_up_cache(  # pylint: disable=too-many-locals,no-self-use
                 {"slice_id": slc.id, "viz_error": error, "viz_status": status}
             )
 
-        return json_success(json.dumps(result))
+        return json_success(json.dumps(result, default=base_json_conv))
 
     @has_access_api
     @event_logger.log_this
diff --git a/tests/integration_tests/core_tests.py b/tests/integration_tests/core_tests.py
@@ -43,7 +43,11 @@
 
 import pandas as pd
 import sqlalchemy as sqla
+from flask_babel import lazy_gettext as _
 from sqlalchemy.exc import SQLAlchemyError
+from superset.charts.commands.exceptions import ChartDataQueryFailedError
+from superset.charts.data.commands.get_data_command import ChartDataCommand
+from superset.exceptions import QueryObjectValidationError
 from superset.models.cache import CacheKey
 from superset.utils.database import get_example_database
 from tests.integration_tests.conftest import with_feature_flags
@@ -577,7 +581,8 @@ def test_databaseview_edit(self, username="admin"):
         db.session.commit()
 
     @pytest.mark.usefixtures(
-        "load_energy_table_with_slice", "load_birth_names_dashboard_with_slices"
+        "load_birth_names_dashboard_with_slices",
+        "load_energy_table_with_slice",
     )
     def test_warm_up_cache(self):
         self.login()
@@ -603,6 +608,26 @@ def test_warm_up_cache(self):
             + quote(json.dumps([{"col": "name", "op": "in", "val": ["Jennifer"]}]))
         ) == [{"slice_id": slc.id, "viz_error": None, "viz_status": "success"}]
 
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @mock.patch.object(ChartDataCommand, "run")
+    def test_warm_up_cache_error(self, run_mock) -> None:
+        self.login()
+        slc = self.get_slice("Pivot Table v2", db.session)
+        run_mock.side_effect = ChartDataQueryFailedError(
+            _(
+                "Error: %(error)s",
+                error=_("Empty query?"),
+            )
+        )
+
+        assert self.get_json_resp(f"/superset/warm_up_cache?slice_id={slc.id}") == [
+            {
+                "slice_id": slc.id,
+                "viz_error": "Error: Empty query?",
+                "viz_status": None,
+            }
+        ]
+
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_cache_logging(self):
         self.login("admin")
