diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-05-22 12:23:06 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-05-23 13:33:07 -0500 |
| commit | 491029bc364baef9dc0e05832985f3492a7aff77 (patch) | |
| tree | 8382634c0e271b5a4d82e315eeea7f1f9503dcbc /mediagoblin/tests/tools.py | |
| parent | 505b4b39b8ca7b273294e5d42d278dd1b89960ea (diff) | |
| download | mediagoblin-491029bc364baef9dc0e05832985f3492a7aff77.tar.lz mediagoblin-491029bc364baef9dc0e05832985f3492a7aff77.tar.xz mediagoblin-491029bc364baef9dc0e05832985f3492a7aff77.zip | |
Moving test_user_dev->user_dev in plugin app configs & adding plugin static serving
The test_user_dev (as opposed to user_dev) was a legacy before we had
each application running in its own directory (as they now do in
pytest). Move that name to just user_dev... this is more consistent
with the rest of our naming and will make writing these config files
easier. (If we want to test that changing these still works, that
should be a separate unit test with special config files.)
Additionally, add plugin static serving to the common test paste
config file.
This commit sponsored by Juan Jose Marin Martinez. Thank you!
Diffstat (limited to 'mediagoblin/tests/tools.py')
| -rw-r--r-- | mediagoblin/tests/tools.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py index 794ed940..2ee39e89 100644 --- a/mediagoblin/tests/tools.py +++ b/mediagoblin/tests/tools.py @@ -40,8 +40,6 @@ TEST_SERVER_CONFIG = pkg_resources.resource_filename( 'mediagoblin.tests', 'test_paste.ini') TEST_APP_CONFIG = pkg_resources.resource_filename( 'mediagoblin.tests', 'test_mgoblin_app.ini') -TEST_USER_DEV = pkg_resources.resource_filename( - 'mediagoblin.tests', 'test_user_dev') USER_DEV_DIRECTORIES_TO_SETUP = ['media/public', 'media/queue'] @@ -103,7 +101,7 @@ def get_app(request, paste_config=None, mgoblin_config=None): # This is the directory we're copying the paste/mgoblin config stuff into run_dir = request.config._tmpdirhandler.mktemp( 'mgoblin_app', numbered=True) - user_dev_dir = run_dir.mkdir('test_user_dev').strpath + user_dev_dir = run_dir.mkdir('user_dev').strpath new_paste_config = run_dir.join('paste.ini').strpath new_mgoblin_config = run_dir.join('mediagoblin.ini').strpath @@ -232,3 +230,4 @@ def fixture_add_collection(name=u"My first Collection", user=None): Session.expunge(coll) return coll + |