diff options
| -rw-r--r-- | repoze/bfg/configuration.py | 7 | ||||
| -rw-r--r-- | repoze/bfg/tests/test_configuration.py | 22 |
2 files changed, 24 insertions, 5 deletions
diff --git a/repoze/bfg/configuration.py b/repoze/bfg/configuration.py index 7a761e3d7..16d61d367 100644 --- a/repoze/bfg/configuration.py +++ b/repoze/bfg/configuration.py @@ -537,10 +537,9 @@ class Configurator(object): package = sys.modules[package] override_package = sys.modules[override_package] - if _override is None: - _override = self._override - _override(package, path, override_package, override_prefix, - _info=_info) + override = _override or self._override # test jig + override(package, path, override_package, override_prefix, + _info=_info) def _override(self, package, path, override_package, override_prefix, _info=u'', PackageOverrides=PackageOverrides): diff --git a/repoze/bfg/tests/test_configuration.py b/repoze/bfg/tests/test_configuration.py index d7f33534e..bac6ea8b1 100644 --- a/repoze/bfg/tests/test_configuration.py +++ b/repoze/bfg/tests/test_configuration.py @@ -1436,7 +1436,27 @@ class ConfiguratorTests(unittest.TestCase): result = view(context, request) self.assertEqual(result, 'OK2') - def test_view_as_function_context_and_request(self): + def test_notfound(self): + from repoze.bfg.interfaces import INotFoundView + config = self._makeOne() + view = lambda *arg: 'OK' + config.notfound(view) + request = self._makeRequest(config) + view = config.reg.getUtility(INotFoundView) + result = view(None, request) + self.assertEqual(result, 'OK') + + def test_forbidden(self): + from repoze.bfg.interfaces import IForbiddenView + config = self._makeOne() + view = lambda *arg: 'OK' + config.forbidden(view) + request = self._makeRequest(config) + view = config.reg.getUtility(IForbiddenView) + result = view(None, request) + self.assertEqual(result, 'OK') + + def test_derive_view_as_function_context_and_request(self): def view(context, request): return 'OK' config = self._makeOne() |