Test coverage.

3 files changed, 6 insertions, 26 deletions

diff --git a/repoze/bfg/registry.py b/repoze/bfg/registry.py
index 796ac0dfa..e93d9dcaf 100644
--- a/repoze/bfg/registry.py
+++ b/repoze/bfg/registry.py
@@ -6,10 +6,6 @@ class Registry(Components, dict):
     # to notify them
     has_listeners = False
 
-    def reset(self):
-        self.__init__(self.__name__)
-        self.clear()
-
     def registerSubscriptionAdapter(self, *arg, **kw):
         result = Components.registerSubscriptionAdapter(self, *arg, **kw)
         self.has_listeners = True
diff --git a/repoze/bfg/tests/test_configuration.py b/repoze/bfg/tests/test_configuration.py
index b2fc27e3e..e15bba5a9 100644
--- a/repoze/bfg/tests/test_configuration.py
+++ b/repoze/bfg/tests/test_configuration.py
@@ -232,9 +232,6 @@ class DummyRootFactory:
     def __init__(self, root):
         self.root = root
 
-    def __call__(self, environ):
-        return self.root
-
 class DummyLogger:
     def __init__(self):
         self.messages = []
@@ -253,14 +250,3 @@ class DummyLock:
     def release(self):
         self.released = True
         
-class DummyThreadLocalManager:
-    def __init__(self, data):
-        self.data = data
-
-    def pop(self):
-        self.popped = True
-        return self.data
-
-    def push(self, data):
-        self.pushed = data
-
diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py
index d592fd902..77137ceba 100644
--- a/repoze/bfg/tests/test_zcml.py
+++ b/repoze/bfg/tests/test_zcml.py
@@ -740,7 +740,7 @@ class TestViewDirective(unittest.TestCase):
         view = lambda *arg: None
         sm = getSiteManager()
         def view(context, request):
-            return '123'
+            """ """
         self._callFUT(context, None, IFoo, view=view, xhr=True)
         actions = context.actions
         self.assertEqual(len(actions), 1)
@@ -758,8 +758,6 @@ class TestViewDirective(unittest.TestCase):
     def test_with_header_badregex(self):
         from zope.component import getSiteManager
         from zope.interface import Interface
-        from repoze.bfg.interfaces import IRequest
-        from repoze.bfg.interfaces import IView
         from zope.configuration.exceptions import ConfigurationError
         class IFoo(Interface):
             pass
@@ -767,7 +765,7 @@ class TestViewDirective(unittest.TestCase):
         view = lambda *arg: None
         sm = getSiteManager()
         def view(context, request):
-            return '123'
+            """ """
         self.assertRaises(ConfigurationError, self._callFUT,
                           context, None, IFoo,
                           view=view, header='Host:a\\')
@@ -810,7 +808,7 @@ class TestViewDirective(unittest.TestCase):
         view = lambda *arg: None
         sm = getSiteManager()
         def view(context, request):
-            return '123'
+            """ """
         self._callFUT(context, None, IFoo, view=view, header='Host')
         actions = context.actions
         self.assertEqual(len(actions), 1)
@@ -863,7 +861,7 @@ class TestViewDirective(unittest.TestCase):
         view = lambda *arg: None
         sm = getSiteManager()
         def view(context, request):
-            return '123'
+            """ """
         self._callFUT(context, None, IFoo, view=view, header=r'Host:\d')
         actions = context.actions
         self.assertEqual(len(actions), 1)
@@ -916,7 +914,7 @@ class TestViewDirective(unittest.TestCase):
         view = lambda *arg: None
         sm = getSiteManager()
         def view(context, request):
-            return '123'
+            """ """
         self._callFUT(context, None, IFoo, view=view, accept='text/xml')
         actions = context.actions
         self.assertEqual(len(actions), 1)
@@ -2033,7 +2031,7 @@ class TestRouteDirective(unittest.TestCase):
         self.assertEqual(route_discriminator[1], 'name')
         self.assertEqual(route_args, ('path', 'name', None))
 
-    def test_with_view_xhr_alias(self):
+    def test_with_view_accept_alias(self):
         from zope.component import getSiteManager
         from zope.interface import implementedBy
         from repoze.bfg.zcml import connect_route