Merge lp:~salgado/lazr.restful/bug-507447 into lp:lazr.restful

[Guilherme Salgado]

[Guilherme Salgado (salgado)]

Fix get_current_browser_request to not raise an AttributeError when
there's no interaction setup

[Henning Eggers (henninge)]

Thank you for this fix. Only suggestion I'd have is to split up the test into two methods.

test_get_current_browser_request_no_interaction
test_get_current_browser_request

Cheers,
Henning

review: Approve (code)

[Guilherme Salgado (salgado)]

On Fri, 2010-01-15 at 11:12 +0000, Henning Eggers wrote:
> Review: Approve code
> Thank you for this fix. Only suggestion I'd have is to split up the test into two methods.
>
> test_get_current_browser_request_no_interaction
> test_get_current_browser_request
>

Yeah, that'd be a nice and trivial change, so, done.

Thanks!

[lp:~salgado/lazr.restful/bug-507447]

98. By Guilherme Salgado on 2010-01-15

Split the new test into two

=== modified file 'HACKING.txt'
--- HACKING.txt	2009-03-25 17:56:54 +0000
+++ HACKING.txt	2010-01-15 14:15:22 +0000
@@ -22,7 +22,7 @@
 These are guidelines for hacking on the lazr.restful project.  But first,
 please see the common hacking guidelines at:
 
-    http://dev.launchpad.net/Hacking
+    https://dev.launchpad.net/HackingLazrLibraries
 
 
 Getting help

=== added file 'src/lazr/restful/tests/test_utils.py'
--- src/lazr/restful/tests/test_utils.py	1970-01-01 00:00:00 +0000
+++ src/lazr/restful/tests/test_utils.py	2010-01-15 14:15:22 +0000
@@ -0,0 +1,29 @@
+# Copyright 2010 Canonical Ltd.  All rights reserved.
+
+"""Test for lazr.restful.utils."""
+
+__metaclass__ = type
+
+import unittest
+
+from zope.publisher.browser import TestRequest
+from zope.security.management import (
+    endInteraction, newInteraction, queryInteraction)
+
+from lazr.restful.utils import get_current_browser_request
+
+
+class TestUtils(unittest.TestCase):
+
+    def test_get_current_browser_request_no_interaction(self):
+        # When there's no interaction setup, get_current_browser_request()
+        # returns None.
+        self.assertEquals(None, queryInteraction())
+        self.assertEquals(None, get_current_browser_request())
+
+    def test_get_current_browser_request(self):
+        # When there is an interaction, it returns the interaction's request.
+        request = TestRequest()
+        newInteraction(request)
+        self.assertEquals(request, get_current_browser_request())
+        endInteraction()

=== modified file 'src/lazr/restful/tests/test_webservice.py'
--- src/lazr/restful/tests/test_webservice.py	2010-01-11 18:27:43 +0000
+++ src/lazr/restful/tests/test_webservice.py	2010-01-15 14:15:22 +0000
@@ -28,7 +28,6 @@
 from lazr.restful.testing.webservice import (
     create_web_service_request, WebServiceTestPublication)
 from lazr.restful.testing.tales import test_tales
-from lazr.restful.utils import get_current_browser_request
 
 
 def get_resource_factory(model_interface, resource_interface):

=== modified file 'src/lazr/restful/utils.py'
--- src/lazr/restful/utils.py	2010-01-14 10:00:38 +0000
+++ src/lazr/restful/utils.py	2010-01-15 14:15:22 +0000
@@ -223,6 +223,8 @@
     from zope.security.management import queryInteraction
     from zope.publisher.interfaces.http import IHTTPApplicationRequest
     interaction = queryInteraction()
+    if interaction is None:
+        return None
     requests = [
         participation
         for participation in interaction.participations