diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-03-25 15:29:18 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-03-25 15:29:18 +0000 |
commit | b6fbdd05735ed860ed8cca35ea28cd524f6bdeff (patch) | |
tree | 723a4567d74dd66f2876c3ee1d737149f9623fa4 /pecan | |
parent | 8b70d60a290353a56e6ab9229ae6cc6a447e874d (diff) | |
parent | 2227b15247eb988fd39c93cc37986cb5e3a0d542 (diff) | |
download | pecan-b6fbdd05735ed860ed8cca35ea28cd524f6bdeff.tar.gz |
Merge "Pass arbitrary keyword args to load_test_app"
Diffstat (limited to 'pecan')
-rw-r--r-- | pecan/core.py | 4 | ||||
-rw-r--r-- | pecan/testing.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pecan/core.py b/pecan/core.py index 1e4e7f3..f7603ba 100644 --- a/pecan/core.py +++ b/pecan/core.py @@ -141,7 +141,7 @@ def render(template, namespace): return state.app.render(template, namespace) -def load_app(config): +def load_app(config, **kwargs): ''' Used to load a ``Pecan`` application and its environment based on passed configuration. @@ -157,7 +157,7 @@ def load_app(config): for package_name in getattr(_runtime_conf.app, 'modules', []): module = __import__(package_name, fromlist=['app']) if hasattr(module, 'app') and hasattr(module.app, 'setup_app'): - app = module.app.setup_app(_runtime_conf) + app = module.app.setup_app(_runtime_conf, **kwargs) app.config = _runtime_conf return app raise RuntimeError( diff --git a/pecan/testing.py b/pecan/testing.py index ee2896e..14986ff 100644 --- a/pecan/testing.py +++ b/pecan/testing.py @@ -2,7 +2,7 @@ from pecan import load_app from webtest import TestApp -def load_test_app(config=None): +def load_test_app(config=None, **kwargs): """ Used for functional tests where you need to test your literal application and its integration with the framework. @@ -32,4 +32,4 @@ def load_test_app(config=None): resp = app.get('/path/to/some/resource').status_int assert resp.status_int == 200 """ - return TestApp(load_app(config)) + return TestApp(load_app(config, **kwargs)) |