Skip to content

Commit 5a78fdf

Browse files
committed
fix tests
1 parent b94e342 commit 5a78fdf

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/mxmake/templates.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -514,15 +514,17 @@ def template_variables(self):
514514
site.setdefault("setup_content", False)
515515
site.setdefault("default_language", "en")
516516
site.setdefault("portal_timezone", "UTC")
517-
site.setdefault("extension_ids", "")
518517
site.update(**self.settings)
519518
if "distribution" in site:
520519
vars["distribution"] = site.pop("distribution")
521520

522521
# handle extension ids
523-
site["extension_ids"] = [
524-
eid.strip() for eid in site["extension_ids"].split("\n") if eid.strip()
525-
]
522+
if site.get("extension_ids", None) is not None:
523+
site["extension_ids"] = [
524+
eid.strip() for eid in site["extension_ids"].split("\n") if eid.strip()
525+
]
526+
else:
527+
site["extension_ids"] = []
526528
return vars
527529

528530

src/mxmake/tests/test_templates.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,8 @@ def test_MxIni(self, tempdir):
820820
# VAR = value
821821
822822
[mxmake-plone-site]
823-
distribution = default
823+
distribution = volto
824+
extension_ids = plone.volto:default
824825
825826
[mxmake-run-coverage]
826827
environment = env
@@ -850,7 +851,7 @@ def test_PloneSite_all_defaults(self, tempdir):
850851
{
851852
"site": {
852853
"default_language": "en",
853-
"extension_ids": ["plone.volto:default"],
854+
'extension_ids': [],
854855
"portal_timezone": "UTC",
855856
"setup_content": False,
856857
"site_id": "Plone",
@@ -902,9 +903,6 @@ def asbool(value: str | bool | None) -> bool:
902903
"setup_content": "False",
903904
"default_language": "en",
904905
"portal_timezone": "UTC",
905-
"extension_ids": [
906-
"plone.volto:default",
907-
],
908906
"profile_id": _DEFAULT_PROFILE,
909907
}
910908
config["setup_content"] = asbool(config["setup_content"])

0 commit comments

Comments
 (0)