diff options
| author | cfdv <caldavis@gmail.com> | 2011-06-20 12:50:44 -0500 |
|---|---|---|
| committer | cfdv <caldavis@gmail.com> | 2011-06-20 12:50:44 -0500 |
| commit | 78c0744077b58fb4c20a965fdbbb52055922d793 (patch) | |
| tree | 8ba6033b3f7d8e19c78f59dca2db8ee97872647c /mediagoblin/tests/tools.py | |
| parent | cd95cb6d3d6ffa403be5f2b347862929917aa1e3 (diff) | |
| parent | 5c441e75ebc4ad63c3a5362d9bc451abe97984d2 (diff) | |
| download | mediagoblin-78c0744077b58fb4c20a965fdbbb52055922d793.tar.lz mediagoblin-78c0744077b58fb4c20a965fdbbb52055922d793.tar.xz mediagoblin-78c0744077b58fb4c20a965fdbbb52055922d793.zip | |
Merge remote-tracking branch 'origin/master' into is315
Diffstat (limited to 'mediagoblin/tests/tools.py')
| -rw-r--r-- | mediagoblin/tests/tools.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py index 515bccd4..9e36fc5c 100644 --- a/mediagoblin/tests/tools.py +++ b/mediagoblin/tests/tools.py @@ -30,7 +30,7 @@ from mediagoblin.db.open import setup_connection_and_db_from_config MEDIAGOBLIN_TEST_DB_NAME = '__mediagoblinunittests__' TEST_SERVER_CONFIG = pkg_resources.resource_filename( - 'mediagoblin.tests', 'test_server.ini') + '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( |