Fix errors in collection views

[mediagoblin.git] / mediagoblin / tests / test_celery_setup.py

diff --git a/mediagoblin/tests/test_celery_setup.py b/mediagoblin/tests/test_celery_setup.py
index 4c2f1269fce0c35ad77ebf7321b2f8749aad16c2..5530c6f223ec924c968cc90fb6c30451877f96e4 100644 (file)
--- a/mediagoblin/tests/test_celery_setup.py
+++ b/mediagoblin/tests/test_celery_setup.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -16,7 +16,12 @@
 
 import pkg_resources
 
-from mediagoblin import celery_setup
+from mediagoblin.init import celery as celery_setup
+from mediagoblin.init.config import read_mediagoblin_config
+
+
+TEST_CELERY_CONF_NOSPECIALDB = pkg_resources.resource_filename(
+    'mediagoblin.tests', 'fake_celery_conf.ini')
 
 
 def test_setup_celery_from_config():
@@ -27,15 +32,12 @@ def test_setup_celery_from_config():
         for var in vars_to_wipe:
             delattr(module, var)
 
+    global_config, validation_result = read_mediagoblin_config(
+        TEST_CELERY_CONF_NOSPECIALDB)
+    app_config = global_config['mediagoblin']
 
     celery_setup.setup_celery_from_config(
-        {},
-        {'something': {'or': 'other'},
-         'celery': {'some_variable': 'floop',
-                    'mail_port': '2000',
-                    'CELERYD_ETA_SCHEDULER_PRECISION': '1.3',
-                    'celery_result_persistent': 'true',
-                    'celery_imports': 'foo.bar.baz this.is.an.import'}},
+        app_config, global_config,
         'mediagoblin.tests.fake_celery_module', set_environ=False)
 
     from mediagoblin.tests import fake_celery_module
@@ -46,8 +48,13 @@ def test_setup_celery_from_config():
     assert isinstance(fake_celery_module.CELERYD_ETA_SCHEDULER_PRECISION, float)
     assert fake_celery_module.CELERY_RESULT_PERSISTENT is True
     assert fake_celery_module.CELERY_IMPORTS == [
-        'foo.bar.baz', 'this.is.an.import']
-    assert fake_celery_module.CELERY_MONGODB_BACKEND_SETTINGS == {
-        'database': 'mediagoblin'}
-    assert fake_celery_module.CELERY_RESULT_BACKEND == 'mongodb'
-    assert fake_celery_module.BROKER_BACKEND == 'mongodb'
+        'foo.bar.baz', 'this.is.an.import', 'mediagoblin.processing.task']
+    assert fake_celery_module.CELERY_RESULT_BACKEND == 'database'
+    assert fake_celery_module.CELERY_RESULT_DBURI == (
+        'sqlite:///' +
+        pkg_resources.resource_filename('mediagoblin.tests', 'celery.db'))
+
+    assert fake_celery_module.BROKER_TRANSPORT == 'sqlalchemy'
+    assert fake_celery_module.BROKER_HOST == (
+        'sqlite:///' +
+        pkg_resources.resource_filename('mediagoblin.tests', 'kombu.db'))