From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 19 Jun 2011 17:59:19 +0000 (-0500)
Subject: Merge branch 'configobj'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fa4e6b279bddb30074c63cfc795a527a8a60c06d;p=mediagoblin.git

Merge branch 'configobj'
---

fa4e6b279bddb30074c63cfc795a527a8a60c06d
diff --cc mediagoblin/tests/test_celery_setup.py
index 2a7601c7,8bf97ae4..33c50e40
--- a/mediagoblin/tests/test_celery_setup.py
+++ b/mediagoblin/tests/test_celery_setup.py
@@@ -14,7 -14,16 +14,14 @@@
  # You should have received a copy of the GNU Affero General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -import pkg_resources
 -
  from mediagoblin import celery_setup
+ from mediagoblin.config import read_mediagoblin_config
+ 
+ 
+ TEST_CELERY_CONF_NOSPECIALDB = pkg_resources.resource_filename(
+     'mediagoblin.tests', 'fake_celery_conf.ini')
+ TEST_CELERY_CONF_MGSPECIALDB = pkg_resources.resource_filename(
+     'mediagoblin.tests', 'fake_celery_conf_mgdb.ini')
  
  
  def test_setup_celery_from_config():