aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-06-20 08:57:58 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-06-20 08:57:58 -0500
commit5c441e75ebc4ad63c3a5362d9bc451abe97984d2 (patch)
treef43d57215d738f2e16822759eb8bb49c50197202
parent41f965c59d0f0673ac6e9f373e60226b3e768559 (diff)
downloadmediagoblin-5c441e75ebc4ad63c3a5362d9bc451abe97984d2.tar.lz
mediagoblin-5c441e75ebc4ad63c3a5362d9bc451abe97984d2.tar.xz
mediagoblin-5c441e75ebc4ad63c3a5362d9bc451abe97984d2.zip
Also moving the test_server.ini to test_paste.ini to avoid ambiguity.
-rw-r--r--mediagoblin/tests/test_paste.ini (renamed from mediagoblin/tests/test_server.ini)0
-rw-r--r--mediagoblin/tests/tools.py2
2 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/tests/test_server.ini b/mediagoblin/tests/test_paste.ini
index 929a1ccf..929a1ccf 100644
--- a/mediagoblin/tests/test_server.ini
+++ b/mediagoblin/tests/test_paste.ini
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(