diff options
| author | Chris McDonough <chrism@agendaless.com> | 2009-11-19 18:51:07 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2009-11-19 18:51:07 +0000 |
| commit | 2deb7a1eb47ae0cc67a615a54bb7a731ee196f1b (patch) | |
| tree | 41a3e59fc959ac9093f198693392e72f21cd1277 | |
| parent | 44a2e4d4ea63c1a55d77429e6905506db22a7a50 (diff) | |
| download | pyramid-2deb7a1eb47ae0cc67a615a54bb7a731ee196f1b.tar.gz pyramid-2deb7a1eb47ae0cc67a615a54bb7a731ee196f1b.tar.bz2 pyramid-2deb7a1eb47ae0cc67a615a54bb7a731ee196f1b.zip | |
Coverage.
| -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() |
