diff options
| author | Brett Smith <brettcsmith@brettcsmith.org> | 2012-03-26 14:10:22 -0400 |
|---|---|---|
| committer | Brett Smith <brettcsmith@brettcsmith.org> | 2012-03-26 14:10:22 -0400 |
| commit | c16b8196631e5b1c4cbe618a9af74f5455fe861c (patch) | |
| tree | 5a94548275636849dd8c771de6b5fe854c0f2098 /mediagoblin/tests/test_celery_setup.py | |
| parent | 28f364bd6d488955952aebe86033e5ba148da2fb (diff) | |
| parent | 7ccf41818581743c2e16935cd7308ad3d6694149 (diff) | |
| download | mediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.tar.lz mediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.tar.xz mediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.zip | |
Merge remote branch 'origin/master' into bug261-resized-filenames
This merge involved moving the new FilenameBuilder class to
processing/__init__.py, and putting the comment deletion tests back into
test_submission.py using the refactored functions.
Diffstat (limited to 'mediagoblin/tests/test_celery_setup.py')
| -rw-r--r-- | mediagoblin/tests/test_celery_setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/tests/test_celery_setup.py b/mediagoblin/tests/test_celery_setup.py index fd600f56..5530c6f2 100644 --- a/mediagoblin/tests/test_celery_setup.py +++ b/mediagoblin/tests/test_celery_setup.py @@ -48,7 +48,7 @@ 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', 'mediagoblin.processing'] + '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:///' + |