gabotorresruiz commented on code in PR #43571:
URL: https://github.com/apache/superset/pull/43571#discussion_r4136967402
##########
tests/unit_tests/mcp_service/chart/test_chart_utils.py:
##########
@@ -105,6 +105,60 @@ def test_merge_chart_preserves_omitted_defaults(
assert merged["metric"] == new_form_data["metric"]
[email protected](
+ "updates,expected",
+ [
+ ({}, {"color_scheme": "lyftColors", "row_limit": 42}),
+ (
+ {"color_scheme": "googleCategory10c", "row_limit": 200},
+ {"color_scheme": "googleCategory10c", "row_limit": 200},
+ ),
+ ],
+)
+def test_merge_radar_preserves_omitted_defaults(
Review Comment:
Not a blocker, purely a merge-order heads up since you own both PRs.
This test and `test_merge_bubble_preserves_omitted_defaults` in #44618 are
inserted at the same point in this file, both directly after
`test_merge_chart_preserves_omitted_defaults`, and both branches start from the
same blob of it. I ran `git merge-tree` across the two heads and they do
conflict, in this file only:
```
CONFLICT (content): Merge conflict in
tests/unit_tests/mcp_service/chart/test_chart_utils.py
```
The plugin changes are in different files, so whichever lands second just
needs a keep both resolution here. Nothing to do now, just so it is not a
surprise.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
