diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-02 15:48:49 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-02 15:48:49 -0500 |
| commit | 5d5eb6c3310ac7dea78a5788919a848dd3203616 (patch) | |
| tree | fafdce96bddaedd6aa011b10eca9f3707e6afb5a /mediagoblin/tests/test_celery_setup.py | |
| parent | 2110408f4437a9bd7d4d158139cf869518c46456 (diff) | |
| parent | 421129b6bbf460057831914c25ab5694f5d21d4f (diff) | |
| download | mediagoblin-5d5eb6c3310ac7dea78a5788919a848dd3203616.tar.lz mediagoblin-5d5eb6c3310ac7dea78a5788919a848dd3203616.tar.xz mediagoblin-5d5eb6c3310ac7dea78a5788919a848dd3203616.zip | |
Merge remote branch 'remotes/elrond/dev/init'
Diffstat (limited to 'mediagoblin/tests/test_celery_setup.py')
| -rw-r--r-- | mediagoblin/tests/test_celery_setup.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/tests/test_celery_setup.py b/mediagoblin/tests/test_celery_setup.py index 8bf97ae4..b80cab49 100644 --- a/mediagoblin/tests/test_celery_setup.py +++ b/mediagoblin/tests/test_celery_setup.py @@ -16,8 +16,8 @@ import pkg_resources -from mediagoblin import celery_setup -from mediagoblin.config import read_mediagoblin_config +from mediagoblin.init import celery as celery_setup +from mediagoblin.init.config import read_mediagoblin_config TEST_CELERY_CONF_NOSPECIALDB = pkg_resources.resource_filename( |