Skip to content

[fix] Preserve ZCA site for transaction hooks that depend on it #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rpatterson wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[fix] Preserve ZCA site for transaction hooks that depend on it #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fae5876
[fix] Preserve ZCA site for transaction hooks that depend on it
rpatterson Jan 3, 2020
293ffbf
[docs] Add missing changelog entry
rpatterson Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/63.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Preserve ZCA site for transaction hooks that depend on it.
22 changes: 11 additions & 11 deletions src/plone/app/testing/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,18 +256,19 @@ def ploneSite(db=None, connection=None, environ=None, flavour=zope):
setHooks()
site = getSite()

with getattr(flavour, 'zopeApp')(db, connection, environ) as app:
portal = app[PLONE_SITE_ID]
try:
with getattr(flavour, 'zopeApp')(db, connection, environ) as app:
portal = app[PLONE_SITE_ID]

setSite(portal)
login(portal, TEST_USER_NAME)
setSite(portal)
login(portal, TEST_USER_NAME)

try:
yield portal
finally:
logout()
if site is not portal:
setSite(site)
try:
yield portal
finally:
logout()
finally:
setSite(site)


# Layer base class
Expand Down Expand Up @@ -379,7 +380,6 @@ def setUp(self):
# Allow subclass to configure a persistent fixture
setSite(portal)
self.setUpPloneSite(portal)
setSite(None)

# Keep track of PAS plugins that were added during setup
self.snapshotMultiPlugins(preSetupMultiPlugins)
Expand Down