Merge authchanges branch to trunk.

1 files changed, 9 insertions, 55 deletions

diff --git a/repoze/bfg/tests/test_registry.py b/repoze/bfg/tests/test_registry.py
index 77031806f..d145e7700 100644
--- a/repoze/bfg/tests/test_registry.py
+++ b/repoze/bfg/tests/test_registry.py
@@ -53,10 +53,10 @@ class TestPopulateRegistry(unittest.TestCase):
     def test_it(self):
         from repoze.bfg.tests import fixtureapp
         dummylock = DummyLock()
-        dummyregmgr = DummyRegistrationManager()
-        import repoze.bfg.registry
+        dummyregmgr = DummyThreadLocalManager({'registry':None})
+        import repoze.bfg.threadlocal
         try:
-            old = repoze.bfg.registry.setRegistryManager(dummyregmgr)
+            old = repoze.bfg.threadlocal.setManager(dummyregmgr)
             from zope.component.registry import Components
             registry = Components('hello')
             self._callFUT(registry,
@@ -65,49 +65,9 @@ class TestPopulateRegistry(unittest.TestCase):
                           lock=dummylock)
             self.assertEqual(dummylock.acquired, True)
             self.assertEqual(dummylock.released, True)
-            self.assertEqual(dummyregmgr.registry, registry)
+            self.assertEqual(dummyregmgr.data['registry'], None)
         finally:
-            repoze.bfg.registry.setRegistryManager(old)
-
-class TestThreadLocalRegistryManager(unittest.TestCase):
-    def setUp(self):
-        cleanUp()
-
-    def tearDown(self):
-        cleanUp()
-
-    def _getTargetClass(self):
-        from repoze.bfg.registry import ThreadLocalRegistryManager
-        return ThreadLocalRegistryManager
-
-    def _makeOne(self):
-        return self._getTargetClass()()
-
-    def test_init(self):
-        local = self._makeOne()
-        from zope.component import getGlobalSiteManager
-        self.assertEqual(local.stack, [])
-        self.assertEqual(local.get(), getGlobalSiteManager())
-
-    def test_push_and_pop(self):
-        local = self._makeOne()
-        from zope.component import getGlobalSiteManager
-        local.push(True)
-        self.assertEqual(local.get(), True)
-        self.assertEqual(local.pop(), True)
-        self.assertEqual(local.pop(), None)
-        self.assertEqual(local.get(), getGlobalSiteManager())
-
-    def test_set_get_and_clear(self):
-        local = self._makeOne()
-        from zope.component import getGlobalSiteManager
-        local.set(None)
-        self.assertEqual(local.stack, [None])
-        self.assertEqual(local.get(), None)
-        local.clear()
-        self.assertEqual(local.get(), getGlobalSiteManager())
-        local.clear()
-        self.assertEqual(local.get(), getGlobalSiteManager())
+            repoze.bfg.threadlocal.setManager(old)
 
 class GetSiteManagerTests(unittest.TestCase):
     def _callFUT(self, context=None):
@@ -122,16 +82,10 @@ class GetSiteManagerTests(unittest.TestCase):
         from zope.component.interfaces import ComponentLookupError
         self.assertRaises(ComponentLookupError, self._callFUT, object)
         
-class DummyRegistrationManager:
-    def push(self, registry):
-        self.registry = registry
-
-    def pop(self):
-        self.popped = True
-
-    def get(self):
-        return self.registry
-
+class DummyThreadLocalManager:
+    def __init__(self, data):
+        self.data = data
+        
 class DummyLock:
     def acquire(self):
         self.acquired = True