10 files changed, 28 insertions, 67 deletions
diff --git a/mediagoblin/tests/fake_carrot_conf_bad.ini b/mediagoblin/tests/fake_carrot_conf_bad.ini
index 0c79b354..9d8cf518 100644
--- a/mediagoblin/tests/fake_carrot_conf_bad.ini
+++ b/mediagoblin/tests/fake_carrot_conf_bad.ini
@@ -11,4 +11,4 @@ encouragement_phrase = 586956856856 # shouldn't throw error
 blah_blah = "blah!" # shouldn't throw error either
 
 [celery]
-eat_celery_with_carrots = pants # yeah that's def an error right there.
+EAT_CELERY_WITH_CARROTS = pants # yeah that's def an error right there.
diff --git a/mediagoblin/tests/fake_carrot_conf_good.ini b/mediagoblin/tests/fake_carrot_conf_good.ini
index fed14d07..1377907b 100644
--- a/mediagoblin/tests/fake_carrot_conf_good.ini
+++ b/mediagoblin/tests/fake_carrot_conf_good.ini
@@ -10,4 +10,4 @@ encouragement_phrase = "I'd love it if you eat your carrots!"
 blah_blah = "blah!"
 
 [celery]
-eat_celery_with_carrots = False
+EAT_CELERY_WITH_CARROTS = False
diff --git a/mediagoblin/tests/fake_celery_conf.ini b/mediagoblin/tests/fake_celery_conf.ini
index 3e52ac3a..67b0cba6 100644
--- a/mediagoblin/tests/fake_celery_conf.ini
+++ b/mediagoblin/tests/fake_celery_conf.ini
@@ -1,9 +1,9 @@
-['mediagoblin']
+[mediagoblin]
 # I got nothin' in this file!
 
-['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
+[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
diff --git a/mediagoblin/tests/fake_celery_conf_mgdb.ini b/mediagoblin/tests/fake_celery_conf_mgdb.ini
deleted file mode 100644
index 52671c14..00000000
--- a/mediagoblin/tests/fake_celery_conf_mgdb.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-['mediagoblin']
-db_host = mongodb.example.org
-db_port = 8080
-db_name = captain_lollerskates
-
-['something']
-or = other
-
-['celery']
-some_variable = poolf
-mail_port = 2020
-celeryd_eta_scheduler_precision = 3.1
-celery_result_persistent = false
-celery_imports = baz.bar.foo, import.is.a.this
diff --git a/mediagoblin/tests/fake_config_spec.ini b/mediagoblin/tests/fake_config_spec.ini
index 9421ce36..43f2e236 100644
--- a/mediagoblin/tests/fake_config_spec.ini
+++ b/mediagoblin/tests/fake_config_spec.ini
@@ -7,4 +7,4 @@ num_carrots = integer(default=1)
 encouragement_phrase = string()
 
 [celery]
-eat_celery_with_carrots = boolean(default=True)
-\ No newline at end of file
+EAT_CELERY_WITH_CARROTS = boolean(default=True)
+\ No newline at end of file
diff --git a/mediagoblin/tests/test_celery_setup.py b/mediagoblin/tests/test_celery_setup.py
index c9c77821..fd600f56 100644
--- a/mediagoblin/tests/test_celery_setup.py
+++ b/mediagoblin/tests/test_celery_setup.py
@@ -22,8 +22,6 @@ from mediagoblin.init.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():
@@ -51,35 +49,12 @@ def test_setup_celery_from_config():
     assert fake_celery_module.CELERY_RESULT_PERSISTENT is True
     assert fake_celery_module.CELERY_IMPORTS == [
         'foo.bar.baz', 'this.is.an.import', 'mediagoblin.processing']
-    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'
-
-    _wipe_testmodule_clean(fake_celery_module)
-
-    global_config, validation_result = read_mediagoblin_config(
-        TEST_CELERY_CONF_MGSPECIALDB)
-    app_config = global_config['mediagoblin']
-
-    celery_setup.setup_celery_from_config(
-        app_config, global_config,
-        'mediagoblin.tests.fake_celery_module', set_environ=False)
-    
-    from mediagoblin.tests import fake_celery_module
-    assert fake_celery_module.SOME_VARIABLE == 'poolf'
-    assert fake_celery_module.MAIL_PORT == 2020
-    assert isinstance(fake_celery_module.MAIL_PORT, int)
-    assert fake_celery_module.CELERYD_ETA_SCHEDULER_PRECISION == 3.1
-    assert isinstance(fake_celery_module.CELERYD_ETA_SCHEDULER_PRECISION, float)
-    assert fake_celery_module.CELERY_RESULT_PERSISTENT is False
-    assert fake_celery_module.CELERY_IMPORTS == [
-        'baz.bar.foo', 'import.is.a.this', 'mediagoblin.processing']
-    assert fake_celery_module.CELERY_MONGODB_BACKEND_SETTINGS == {
-        'database': 'captain_lollerskates',
-        'host': 'mongodb.example.org',
-        'port': 8080}
-    assert fake_celery_module.CELERY_RESULT_BACKEND == 'mongodb'
-    assert fake_celery_module.BROKER_BACKEND == 'mongodb'
-    assert fake_celery_module.BROKER_HOST == 'mongodb.example.org'
-    assert fake_celery_module.BROKER_PORT == 8080
+    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'))
diff --git a/mediagoblin/tests/test_config.py b/mediagoblin/tests/test_config.py
index c596f6a6..7d8c65c1 100644
--- a/mediagoblin/tests/test_config.py
+++ b/mediagoblin/tests/test_config.py
@@ -37,7 +37,7 @@ def test_read_mediagoblin_config():
     assert this_conf['carrotapp']['carrotcake'] == False
     assert this_conf['carrotapp']['num_carrots'] == 1
     assert not this_conf['carrotapp'].has_key('encouragement_phrase')
-    assert this_conf['celery']['eat_celery_with_carrots'] == True
+    assert this_conf['celery']['EAT_CELERY_WITH_CARROTS'] == True
 
     # A good file
     this_conf, validation_results = config.read_mediagoblin_config(
@@ -48,7 +48,7 @@ def test_read_mediagoblin_config():
     assert this_conf['carrotapp']['encouragement_phrase'] == \
         "I'd love it if you eat your carrots!"
     assert this_conf['carrotapp']['blah_blah'] == "blah!"
-    assert this_conf['celery']['eat_celery_with_carrots'] == False
+    assert this_conf['celery']['EAT_CELERY_WITH_CARROTS'] == False
 
     # A bad file
     this_conf, validation_results = config.read_mediagoblin_config(
@@ -61,7 +61,7 @@ def test_read_mediagoblin_config():
     assert this_conf['carrotapp']['encouragement_phrase'] == \
         "586956856856"
     assert this_conf['carrotapp']['blah_blah'] == "blah!"
-    assert this_conf['celery']['eat_celery_with_carrots'] == "pants"
+    assert this_conf['celery']['EAT_CELERY_WITH_CARROTS'] == "pants"
 
 
 def test_generate_validation_report():
@@ -89,7 +89,7 @@ There were validation problems loading this config file:
     expected_warnings = [
         'carrotapp:carrotcake = the value "slobber" is of the wrong type.',
         'carrotapp:num_carrots = the value "GROSS" is of the wrong type.',
-        'celery:eat_celery_with_carrots = the value "pants" is of the wrong type.']
+        'celery:EAT_CELERY_WITH_CARROTS = the value "pants" is of the wrong type.']
     warnings = report.splitlines()[2:]
 
     assert len(warnings) == 3
diff --git a/mediagoblin/tests/test_mgoblin_app.ini b/mediagoblin/tests/test_mgoblin_app.ini
index c91ed92b..01bf0972 100644
--- a/mediagoblin/tests/test_mgoblin_app.ini
+++ b/mediagoblin/tests/test_mgoblin_app.ini
@@ -26,4 +26,4 @@ data_dir = %(here)s/test_user_dev/beaker/cache/data
 lock_dir = %(here)s/test_user_dev/beaker/cache/lock
 
 [celery]
-celery_always_eager = true
+CELERY_ALWAYS_EAGER = true
diff --git a/mediagoblin/tests/test_paste.ini b/mediagoblin/tests/test_paste.ini
index bd57994b..d7c18642 100644
--- a/mediagoblin/tests/test_paste.ini
+++ b/mediagoblin/tests/test_paste.ini
@@ -29,7 +29,7 @@ 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
+CELERY_ALWAYS_EAGER = true
 
 [server:main]
 use = egg:Paste#http
diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py
index 217926a4..2f11bdfb 100644
--- a/mediagoblin/tests/test_submission.py
+++ b/mediagoblin/tests/test_submission.py
@@ -140,7 +140,7 @@ class TestSubmission:
         context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/user_pages/user.html']
         request = context['request']
         media = request.db.MediaEntry.find({'title': 'Balanced Goblin'})[0]
-        assert_equal(media['tags'],
+        assert_equal(media.tags,
                      [{'name': u'yin', 'slug': u'yin'},
                                             {'name': u'yang', 'slug': u'yang'}])
 
@@ -255,7 +255,7 @@ class TestSubmission:
             {'title': 'Malicious Upload 2'})
         assert_equal(entry.state, 'failed')
         assert_equal(
-            entry['fail_error'],
+            entry.fail_error,
             u'mediagoblin.processing:BadMediaFail')
 
         # Test non-supported file with .png extension
@@ -275,5 +275,5 @@ class TestSubmission:
             {'title': 'Malicious Upload 3'})
         assert_equal(entry.state, 'failed')
         assert_equal(
-            entry['fail_error'],
+            entry.fail_error,
             u'mediagoblin.processing:BadMediaFail')