From 5c441e75ebc4ad63c3a5362d9bc451abe97984d2 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Mon, 20 Jun 2011 08:57:58 -0500
Subject: Also moving the test_server.ini to test_paste.ini to avoid ambiguity.

---
 mediagoblin/tests/test_paste.ini  | 37 +++++++++++++++++++++++++++++++++++++
 mediagoblin/tests/test_server.ini | 37 -------------------------------------
 mediagoblin/tests/tools.py        |  2 +-
 3 files changed, 38 insertions(+), 38 deletions(-)
 create mode 100644 mediagoblin/tests/test_paste.ini
 delete mode 100644 mediagoblin/tests/test_server.ini

diff --git a/mediagoblin/tests/test_paste.ini b/mediagoblin/tests/test_paste.ini
new file mode 100644
index 00000000..929a1ccf
--- /dev/null
+++ b/mediagoblin/tests/test_paste.ini
@@ -0,0 +1,37 @@
+[DEFAULT]
+debug = true
+
+[composite:main]
+use = egg:Paste#urlmap
+/ = mediagoblin
+/mgoblin_media/ = publicstore_serve
+/mgoblin_static/ = mediagoblin_static
+
+[app:mediagoblin]
+use = egg:mediagoblin#app
+filter-with = beaker
+config = %(here)s/test_mgoblin_app.ini
+
+[app:publicstore_serve]
+use = egg:Paste#static
+document_root = %(here)s/user_dev/media/public
+
+[app:mediagoblin_static]
+use = egg:Paste#static
+document_root = %(here)s/mediagoblin/static/
+
+[filter:beaker]
+use = egg:Beaker#beaker_session
+cache_dir = %(here)s/test_user_dev/beaker
+beaker.session.key = mediagoblin
+# beaker.session.secret = somesupersecret
+beaker.session.data_dir = %(here)s/test_user_dev/beaker/sessions/data
+beaker.session.lock_dir = %(here)s/test_user_dev/beaker/sessions/lock
+
+[celery]
+celery_always_eager = true
+
+[server:main]
+use = egg:Paste#http
+host = 127.0.0.1
+port = 6543
diff --git a/mediagoblin/tests/test_server.ini b/mediagoblin/tests/test_server.ini
deleted file mode 100644
index 929a1ccf..00000000
--- a/mediagoblin/tests/test_server.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[DEFAULT]
-debug = true
-
-[composite:main]
-use = egg:Paste#urlmap
-/ = mediagoblin
-/mgoblin_media/ = publicstore_serve
-/mgoblin_static/ = mediagoblin_static
-
-[app:mediagoblin]
-use = egg:mediagoblin#app
-filter-with = beaker
-config = %(here)s/test_mgoblin_app.ini
-
-[app:publicstore_serve]
-use = egg:Paste#static
-document_root = %(here)s/user_dev/media/public
-
-[app:mediagoblin_static]
-use = egg:Paste#static
-document_root = %(here)s/mediagoblin/static/
-
-[filter:beaker]
-use = egg:Beaker#beaker_session
-cache_dir = %(here)s/test_user_dev/beaker
-beaker.session.key = mediagoblin
-# beaker.session.secret = somesupersecret
-beaker.session.data_dir = %(here)s/test_user_dev/beaker/sessions/data
-beaker.session.lock_dir = %(here)s/test_user_dev/beaker/sessions/lock
-
-[celery]
-celery_always_eager = true
-
-[server:main]
-use = egg:Paste#http
-host = 127.0.0.1
-port = 6543
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(
-- 
cgit v1.2.3