Merge ~pappacena/launchpad:oops-report-test-errors into launchpad:master

Proposed by Thiago F. Pappacena
Status: Merged
Approved by: Colin Watson
Approved revision: 93979ea816c2498e6dea44fc7f37d06b6b815b19
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~pappacena/launchpad:oops-report-test-errors
Merge into: launchpad:master
Diff against target: 27 lines (+3/-2)
1 file modified
lib/lp/services/webapp/errorlog.py (+3/-2)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+377039@code.launchpad.net

Commit message

Fixing test errors when accessing person's name for OOPS reports

Description of the change

Fix for the following tests:
xx-opstats
xx-soft-timeout

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/services/webapp/errorlog.py b/lib/lp/services/webapp/errorlog.py
2index ecb53e3..ad63464 100644
3--- a/lib/lp/services/webapp/errorlog.py
4+++ b/lib/lp/services/webapp/errorlog.py
5@@ -26,11 +26,11 @@ from zope.event import notify
6 from zope.exceptions.exceptionformatter import format_exception
7 from zope.interface import implementer
8 from zope.publisher.interfaces.xmlrpc import IXMLRPCRequest
9+from zope.security.proxy import removeSecurityProxy
10 from zope.traversing.namespace import view
11
12 from lp.app import versioninfo
13 from lp.layers import WebServiceLayer
14-from lp.registry.interfaces.person import IPerson
15 from lp.services.config import config
16 from lp.services.messaging import rabbit
17 from lp.services.timeline.requesttimeline import get_request_timeline
18@@ -181,7 +181,8 @@ def attach_http_request(report, context):
19 principal = getattr(request, 'principal', missing)
20
21 person = (
22- principal.person if ILaunchpadPrincipal.providedBy(principal)
23+ removeSecurityProxy(principal.person)
24+ if ILaunchpadPrincipal.providedBy(principal)
25 else None)
26 if person is not None:
27 login = person.name