Fix tests given recent celery "case" change

diff --git a/mediagoblin/tests/fake_carrot_conf_bad.ini b/mediagoblin/tests/fake_carrot_conf_bad.ini
index 0c79b354cb6430e8d7b82107ebca3d968bbb997e..9d8cf51801732ccbc13d4e553444a63f39a38800 100644 (file)
--- 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 fed14d07e77bfdece9dbd6f012a929eb512999ea..1377907b92f69005f7da66c8e01e6219651973a5 100644 (file)
--- 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 3e52ac3a676b4c53e74e8585dbae18751aa3ca13..67b0cba623db19d3eb2218248a0a1a9ab8d92449 100644 (file)
--- 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_config_spec.ini b/mediagoblin/tests/fake_config_spec.ini
index 9421ce36c40ac14605a69b58d3f6546056c44ace..43f2e236a256b62b271c24abd45722be0bd8dcb9 100644 (file)
--- 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_config.py b/mediagoblin/tests/test_config.py
index c596f6a6bd64349eaeef02b9a5f90467a5b0210f..7d8c65c1b1e042b02e01a7481949c690e1fc1576 100644 (file)
--- 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 c91ed92bb4ba7f83f74dd31786f44ef19a09f2ed..01bf097231556f133668602b4c1c2991537a67a3 100644 (file)
--- 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 bd57994b092d357cab9192b23803cf70271efdae..d7c186422d5cd30b95cb88f291916878cebc4d45 100644 (file)
--- 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