Commit: 4b355d125835dbba745bcaa00a4f855e762c1c4e - allura (git)

allura

Commit MetaInfo

• Révision: 4b355d125835dbba745bcaa00a4f855e762c1c4e (tree)
• l'heure: 2012-03-02 00:44:25
• Auteur: Dave Brondsema <dbrondsema@geek...>
• Commiter: Cory Johns

Message de Log

[#3824] don't do extra set_context lookup attempts if an ObjectId was used

Signed-off-by: Dave Brondsema <[e-mail]>

Change Summary

• modified: Allura/allura/lib/helpers.py
• modified: Allura/allura/tests/unit/test_helpers/test_set_context.py

Modification

--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -174,7 +174,7 @@ def set_context(project_shortname_or_id, mount_point=None, app_config_id=None, n
         p = model.Project.query.get(_id=ObjectId(str(project_shortname_or_id)))
     except InvalidId:
         p = None
-    if p is None:
+    if p is None and type(project_shortname_or_id) != ObjectId:
         if neighborhood is None:
             raise TypeError('neighborhood is required; it must not be None')
         if not isinstance(neighborhood, model.Neighborhood):

--- a/Allura/allura/tests/unit/test_helpers/test_set_context.py
+++ b/Allura/allura/tests/unit/test_helpers/test_set_context.py
@@ -1,5 +1,6 @@
 from nose.tools import assert_raises
 from pylons import c
+from bson import ObjectId
 
 from allura.lib.helpers import set_context
 from allura.lib.exceptions import NoSuchProjectError, NoSuchNeighborhoodError
@@ -79,6 +80,13 @@ class TestWhenProjectIsNotFound(WithDatabase):
                       'myproject',
                       neighborhood=nbhd)
 
+    def test_proper_exception_when_id_lookup(self):
+        nbhd = create_neighborhood()
+        assert_raises(NoSuchProjectError,
+                      set_context,
+                      ObjectId(),
+                      neighborhood=None)
+
 class TestWhenNeighborhoodIsNotFound(WithDatabase):
 
     def test_that_it_raises_an_exception(self):