hail mary checkin to fix reported test failures on unknown systems that isnt replicable on my own

7 files changed, 6 insertions, 10 deletions

diff --git a/docs/tutorials/wiki2/src/tests/tutorial/tests.py b/docs/tutorials/wiki2/src/tests/tutorial/tests.py
index 82f6853bc..8439e2748 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/tests.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/tests.py
@@ -115,7 +115,6 @@ class AddPageTests(unittest.TestCase):
     def setUp(self):
         self.session = _initTestingDB()
         self.config = testing.setUp()
-        self.config.begin()
 
     def tearDown(self):
         self.session.remove()
diff --git a/docs/tutorials/wiki2/src/views/tutorial/tests.py b/docs/tutorials/wiki2/src/views/tutorial/tests.py
index 0bc343833..668bf5479 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/tests.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/tests.py
@@ -72,7 +72,6 @@ class AddPageTests(unittest.TestCase):
     def setUp(self):
         self.session = _initTestingDB()
         self.config = testing.setUp()
-        self.config.begin()
 
     def tearDown(self):
         self.session.remove()
diff --git a/pyramid/tests/test_events.py b/pyramid/tests/test_events.py
index e7468f1f3..108a5d2d9 100644
--- a/pyramid/tests/test_events.py
+++ b/pyramid/tests/test_events.py
@@ -124,7 +124,6 @@ class TestSubscriber(unittest.TestCase):
     def setUp(self):
         registry = DummyRegistry()
         self.config = testing.setUp(registry=registry)
-        self.config.begin()
 
     def tearDown(self):
         self.config.end()
diff --git a/pyramid/tests/test_mako_templating.py b/pyramid/tests/test_mako_templating.py
index 49808ed8a..162f774f5 100644
--- a/pyramid/tests/test_mako_templating.py
+++ b/pyramid/tests/test_mako_templating.py
@@ -322,7 +322,6 @@ class TestIntegration(unittest.TestCase):
     def setUp(self):
         import pyramid.mako_templating
         self.config = testing.setUp()
-        self.config.begin()
         self.config.add_settings({'mako.directories':
                                   'pyramid.tests:fixtures'})
         self.config.add_renderer('.mak',
diff --git a/pyramid/tests/test_response.py b/pyramid/tests/test_response.py
index 39360c0af..24931ec4b 100644
--- a/pyramid/tests/test_response.py
+++ b/pyramid/tests/test_response.py
@@ -37,7 +37,6 @@ class TestResponseAdapter(unittest.TestCase):
     def setUp(self):
         registry = Dummy()
         self.config = testing.setUp(registry=registry)
-        self.config.begin()
 
     def tearDown(self):
         self.config.end()
diff --git a/pyramid/tests/test_scripting.py b/pyramid/tests/test_scripting.py
index f01e744b8..a99ae53fe 100644
--- a/pyramid/tests/test_scripting.py
+++ b/pyramid/tests/test_scripting.py
@@ -104,10 +104,12 @@ class Test__make_request(unittest.TestCase):
         # keep registry local so that global_registries is cleared after
         registry = DummyRegistry(DummyFactory)
         global_registries.add(registry)
-        request = self._callFUT('/hello')
-        self.assertEqual(request.environ['path'], '/hello')
-        self.assertEqual(request.registry, registry)
-        global_registries.empty()
+        try:
+            request = self._callFUT('/hello')
+            self.assertEqual(request.environ['path'], '/hello')
+            self.assertEqual(request.registry, registry)
+        finally:
+            global_registries.empty()
 
 class Dummy:
     pass
diff --git a/pyramid/tests/test_settings.py b/pyramid/tests/test_settings.py
index 709a36bc3..5cc4ce561 100644
--- a/pyramid/tests/test_settings.py
+++ b/pyramid/tests/test_settings.py
@@ -6,7 +6,6 @@ class TestGetSettings(unittest.TestCase):
         from pyramid.registry import Registry
         registry = Registry('testing')
         self.config = testing.setUp(registry=registry)
-        self.config.begin()
         from zope.deprecation import __show__
         __show__.off()