Microspeedups.

2 files changed, 30 insertions, 2 deletions

diff --git a/repoze/bfg/tests/test_registry.py b/repoze/bfg/tests/test_registry.py
index c2ed82f7e..3ac0dab88 100644
--- a/repoze/bfg/tests/test_registry.py
+++ b/repoze/bfg/tests/test_registry.py
@@ -83,6 +83,25 @@ class GetSiteManagerTests(unittest.TestCase):
         from zope.component.interfaces import ComponentLookupError
         self.assertRaises(ComponentLookupError, self._callFUT, object)
 
+class GetRegistryTests(unittest.TestCase):
+    def setUp(self):
+        cleanUp()
+
+    def tearDown(self):
+        cleanUp()
+        
+    def _callFUT(self):
+        from repoze.bfg.registry import get_registry
+        return get_registry()
+
+    def test_it(self):
+        from repoze.bfg.threadlocal import manager
+        try:
+            manager.push({'registry':123})
+            self.assertEqual(self._callFUT(), 123)
+        finally:
+            manager.pop()
+    
 class TestFakeRegistry(unittest.TestCase):
     def _getTargetClass(self):
         from repoze.bfg.registry import FakeRegistryManager
diff --git a/repoze/bfg/tests/test_traversal.py b/repoze/bfg/tests/test_traversal.py
index 506a69d17..00b3cc99f 100644
--- a/repoze/bfg/tests/test_traversal.py
+++ b/repoze/bfg/tests/test_traversal.py
@@ -830,9 +830,9 @@ class UnderTraverseTests(unittest.TestCase):
     def tearDown(self):
         cleanUp()
         
-    def _callFUT(self, context, environ):
+    def _callFUT(self, context, environ, registry=None):
         from repoze.bfg.traversal import _traverse
-        return _traverse(context, environ)
+        return _traverse(context, environ, registry)
 
     def _registerTraverserFactory(self, traverser):
         import zope.component
@@ -848,6 +848,15 @@ class UnderTraverseTests(unittest.TestCase):
         result = self._callFUT(context, None)
         self.assertEqual(result, {})
 
+    def test_withregistry(self):
+        from zope.component import getSiteManager
+        registry = getSiteManager()
+        traverser = make_traverser({})
+        self._registerTraverserFactory(traverser)
+        context = DummyContext()
+        result = self._callFUT(context, None, registry)
+        self.assertEqual(result, {})
+
     def test_issixtuple(self):
         traverser = make_traverser((1,2,3,4,5,6))
         self._registerTraverserFactory(traverser)