From 4d671706c601986dd8a8b638246bc43abbf80a19 Mon Sep 17 00:00:00 2001 From: David Glick Date: Sat, 10 Feb 2024 22:03:55 -0800 Subject: [PATCH 1/2] Avoid duplicate installation of plone.app.contenttypes profile --- src/plone/app/robotframework/testing.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/plone/app/robotframework/testing.py b/src/plone/app/robotframework/testing.py index 70c936b..e412e9e 100644 --- a/src/plone/app/robotframework/testing.py +++ b/src/plone/app/robotframework/testing.py @@ -45,7 +45,6 @@ class SimplePublicationLayer(Layer): def setUp(self): with ploneSite() as portal: - applyProfile(portal, "plone.app.contenttypes:default") portal.portal_workflow.setDefaultChain("simple_publication_workflow") def tearDown(self): @@ -56,15 +55,8 @@ def tearDown(self): SIMPLE_PUBLICATION_FIXTURE = SimplePublicationLayer() -class SimplePublicationWithTypesLayer(Layer): - defaultBases = (SIMPLE_PUBLICATION_FIXTURE,) - - def setUp(self): - with ploneSite() as portal: - applyProfile(portal, "plone.app.contenttypes:default") - - -SIMPLE_PUBLICATION_WITH_TYPES_FIXTURE = SimplePublicationLayer() +SimplePublicationWithTypesLayer = SimplePublicationLayer +SIMPLE_PUBLICATION_WITH_TYPES_FIXTURE = SIMPLE_PUBLICATION_FIXTURE class MockMailHostLayer(Layer): From d83d87c02e515d796bbdbc56dfb225f71beb98e0 Mon Sep 17 00:00:00 2001 From: David Glick Date: Sat, 10 Feb 2024 22:06:33 -0800 Subject: [PATCH 2/2] changelog --- news/154.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/154.bugfix diff --git a/news/154.bugfix b/news/154.bugfix new file mode 100644 index 0000000..88786f9 --- /dev/null +++ b/news/154.bugfix @@ -0,0 +1 @@ +Fix duplicate installation of plone.app.contenttypes:default profile. @davisagli