From 87f4a7cb32c9e89c914925f5cf4262834a1dd6d6 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 26 Nov 2010 15:30:26 -0500 Subject: more zcml test flailing --- pyramid/configuration.py | 2 +- pyramid/tests/test_configuration.py | 6 ++++++ pyramid/tests/test_testing.py | 1 + pyramid/tests/test_zcml.py | 16 ---------------- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/pyramid/configuration.py b/pyramid/configuration.py index 9b68736c3..5122b5964 100644 --- a/pyramid/configuration.py +++ b/pyramid/configuration.py @@ -439,9 +439,9 @@ class Configurator(object): negotiator, and various other settings using the configurator's current registry, as per the descriptions in the Configurator constructor.""" - self._fix_registry() registry = self.registry registry.autocommit = autocommit + self._fix_registry() self._set_settings(settings) self._set_root_factory(root_factory) debug_logger = self.maybe_dotted(debug_logger) diff --git a/pyramid/tests/test_configuration.py b/pyramid/tests/test_configuration.py index c52e7cb41..3fce18591 100644 --- a/pyramid/tests/test_configuration.py +++ b/pyramid/tests/test_configuration.py @@ -251,6 +251,8 @@ class ConfiguratorTests(unittest.TestCase): def subscribers(self, events, name): self.events = events return events + def reset_context(self): + self.context_reset = True def registerUtility(self, *arg, **kw): pass reg = DummyRegistry() @@ -260,6 +262,7 @@ class ConfiguratorTests(unittest.TestCase): self.assertEqual(reg.has_listeners, True) self.assertEqual(reg.notify(1), None) self.assertEqual(reg.events, (1,)) + self.assertEqual(reg.context_reset, True) def test_setup_registry_registers_default_exceptionresponse_view(self): from pyramid.interfaces import IExceptionResponse @@ -269,6 +272,8 @@ class ConfiguratorTests(unittest.TestCase): ctx = ConfigurationMachine() def registerUtility(self, *arg, **kw): pass + def reset_context(self): + self.context_reset = True reg = DummyRegistry() config = self._makeOne(reg) views = [] @@ -276,6 +281,7 @@ class ConfiguratorTests(unittest.TestCase): config.setup_registry() self.assertEqual(views[0], ((default_exceptionresponse_view,), {'context':IExceptionResponse})) + self.assertEqual(reg.context_reset, True) def test_setup_registry_explicit_notfound_trumps_iexceptionresponse(self): from zope.interface import implementedBy diff --git a/pyramid/tests/test_testing.py b/pyramid/tests/test_testing.py index f05e7fc01..adbbcb555 100644 --- a/pyramid/tests/test_testing.py +++ b/pyramid/tests/test_testing.py @@ -7,6 +7,7 @@ class TestBase(unittest.TestCase): from pyramid.registry import Registry manager.clear() registry = Registry('testing') + registry.autocommit = True self.registry = registry manager.push({'registry':registry, 'request':None}) from zope.deprecation import __show__ diff --git a/pyramid/tests/test_zcml.py b/pyramid/tests/test_zcml.py index cefddebb5..39b342ffe 100644 --- a/pyramid/tests/test_zcml.py +++ b/pyramid/tests/test_zcml.py @@ -121,7 +121,6 @@ class TestNotFoundDirective(unittest.TestCase): def tearDown(self): testing.tearDown() - self.config = None def _callFUT(self, context, view, **kw): from pyramid.zcml import notfound @@ -189,7 +188,6 @@ class TestForbiddenDirective(unittest.TestCase): def tearDown(self): testing.tearDown() - self.config = None def _callFUT(self, context, view, **kw): from pyramid.zcml import forbidden @@ -257,7 +255,6 @@ class TestRepozeWho1AuthenticationPolicyDirective(unittest.TestCase): def tearDown(self): testing.tearDown() - self.config = None def _callFUT(self, context, **kw): from pyramid.zcml import repozewho1authenticationpolicy @@ -301,7 +298,6 @@ class TestRemoteUserAuthenticationPolicyDirective(unittest.TestCase): def tearDown(self): testing.tearDown() - self.config = None def _callFUT(self, context, **kw): from pyramid.zcml import remoteuserauthenticationpolicy @@ -347,7 +343,6 @@ class TestAuthTktAuthenticationPolicyDirective(unittest.TestCase): def tearDown(self): testing.tearDown() - self.config = None def _callFUT(self, context, secret, **kw): from pyramid.zcml import authtktauthenticationpolicy @@ -409,7 +404,6 @@ class TestACLAuthorizationPolicyDirective(unittest.TestCase): def tearDown(self): testing.tearDown() - self.config = None def _callFUT(self, context, **kw): from pyramid.zcml import aclauthorizationpolicy @@ -438,7 +432,6 @@ class TestRouteDirective(unittest.TestCase): def tearDown(self): testing.tearDown() - self.config = None def _callFUT(self, *arg, **kw): from pyramid.zcml import route @@ -637,7 +630,6 @@ class TestStaticDirective(unittest.TestCase): def tearDown(self): testing.tearDown() - self.config = None def _callFUT(self, *arg, **kw): from pyramid.zcml import static @@ -723,7 +715,6 @@ class TestResourceDirective(unittest.TestCase): def tearDown(self): testing.tearDown() - self.config = None def _callFUT(self, *arg, **kw): from pyramid.zcml import resource @@ -748,7 +739,6 @@ class TestRendererDirective(unittest.TestCase): def tearDown(self): testing.tearDown() - self.config = None def _callFUT(self, *arg, **kw): from pyramid.zcml import renderer @@ -822,7 +812,6 @@ class TestZCMLScanDirective(unittest.TestCase): def tearDown(self): testing.tearDown() - self.config = None def _callFUT(self, context, package): from pyramid.zcml import scan @@ -846,7 +835,6 @@ class TestAdapterDirective(unittest.TestCase): def tearDown(self): testing.tearDown() - self.config = None def _callFUT(self, *arg, **kw): from pyramid.zcml import adapter @@ -937,7 +925,6 @@ class TestSubscriberDirective(unittest.TestCase): def tearDown(self): testing.tearDown() - self.config = None def _callFUT(self, *arg, **kw): from pyramid.zcml import subscriber @@ -1008,7 +995,6 @@ class TestUtilityDirective(unittest.TestCase): def tearDown(self): testing.tearDown() - self.config = None def _callFUT(self, *arg, **kw): from pyramid.zcml import utility @@ -1054,7 +1040,6 @@ class TestTranslationDirDirective(unittest.TestCase): def tearDown(self): testing.tearDown() - self.config = None def _callFUT(self, *arg, **kw): from pyramid.zcml import translationdir @@ -1080,7 +1065,6 @@ class TestLocaleNegotiatorDirective(unittest.TestCase): def tearDown(self): testing.tearDown() - self.config = None def _callFUT(self, *arg, **kw): from pyramid.zcml import localenegotiator -- cgit v1.2.3