tests for setup_celery_from_config()

diff --git a/mediagoblin/celery_setup/__init__.py b/mediagoblin/celery_setup/__init__.py
index 143f9170e92d97b12f8da19242c66235372ef641..3a7f2a5d6ac69e5650aca503c361a39f129e6a97 100644 (file)
--- a/mediagoblin/celery_setup/__init__.py
+++ b/mediagoblin/celery_setup/__init__.py
@@ -133,7 +133,7 @@ def setup_celery_from_config(app_config, global_config,
     __import__(settings_module)
     this_module = sys.modules[settings_module]
 
-    for key, value in celery_settings.items():
+    for key, value in celery_settings.iteritems():
         setattr(this_module, key, value)
     
     if set_environ:

diff --git a/mediagoblin/tests/fake_celery_module.py b/mediagoblin/tests/fake_celery_module.py
new file mode 100644 (file)
index 0000000..c129cbf
--- /dev/null
+++ b/mediagoblin/tests/fake_celery_module.py
@@ -0,0 +1,15 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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/>.

diff --git a/mediagoblin/tests/test_celery_setup.py b/mediagoblin/tests/test_celery_setup.py
new file mode 100644 (file)
index 0000000..4c2f126
--- /dev/null
+++ b/mediagoblin/tests/test_celery_setup.py
@@ -0,0 +1,53 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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
+
+
+def test_setup_celery_from_config():
+    def _wipe_testmodule_clean(module):
+        vars_to_wipe = [
+            var for var in dir(module)
+            if not var.startswith('__') and not var.endswith('__')]
+        for var in vars_to_wipe:
+            delattr(module, var)
+
+
+    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'}},
+        'mediagoblin.tests.fake_celery_module', set_environ=False)
+
+    from mediagoblin.tests import fake_celery_module
+    assert fake_celery_module.SOME_VARIABLE == 'floop'
+    assert fake_celery_module.MAIL_PORT == 2000
+    assert isinstance(fake_celery_module.MAIL_PORT, int)
+    assert fake_celery_module.CELERYD_ETA_SCHEDULER_PRECISION == 1.3
+    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'