clean up chameleon text test setup and teardown

1 files changed, 3 insertions, 22 deletions

diff --git a/pyramid/tests/test_chameleon_text.py b/pyramid/tests/test_chameleon_text.py
index 79bc7984c..789c78bbe 100644
--- a/pyramid/tests/test_chameleon_text.py
+++ b/pyramid/tests/test_chameleon_text.py
@@ -1,23 +1,16 @@
 import unittest
 
-from pyramid.testing import cleanUp
 from pyramid.testing import skip_on
 from pyramid import testing
 
 class Base:
     def setUp(self):
-        cleanUp()
-        import os
-        try:
-            # avoid spew from chameleon logger?
-            os.unlink(self._getTemplatePath('minimal.txt.py'))
-        except:
-            pass
+        self.config = testing.setUp()
         from zope.deprecation import __show__
         __show__.off()
 
     def tearDown(self):
-        cleanUp()
+        testing.tearDown()
         from zope.deprecation import __show__
         __show__.on()
 
@@ -27,22 +20,10 @@ class Base:
         return os.path.join(here, 'fixtures', name)
 
     def _registerUtility(self, utility, iface, name=''):
-        from pyramid.threadlocal import get_current_registry
-        reg = get_current_registry()
+        reg = self.config.registry
         reg.registerUtility(utility, iface, name=name)
-        return reg
-        
 
 class TextTemplateRendererTests(Base, unittest.TestCase):
-    def setUp(self):
-        from pyramid.registry import Registry
-        registry = Registry()
-        self.config = testing.setUp(registry=registry)
-        self.config.begin()
-
-    def tearDown(self):
-        self.config.end()
-        
     def _getTargetClass(self):
         from pyramid.chameleon_text import TextTemplateRenderer
         return TextTemplateRenderer