diff options
| author | Aaron Williamson <aaron@copiesofcopies.org> | 2011-10-03 20:01:14 -0400 |
|---|---|---|
| committer | Aaron Williamson <aaron@copiesofcopies.org> | 2011-10-03 20:01:14 -0400 |
| commit | 43199340a25ab0aa252796f1c865e9ebf0e96649 (patch) | |
| tree | 36ce24fa3992d4646d2c7835399e2eddc55f7612 /mediagoblin/tests/tools.py | |
| parent | 3b74ce94ff90e0bd5b214891becb62a6fc503434 (diff) | |
| parent | 4d7a93a49303344830021bab5a741148b1adb7c3 (diff) | |
| download | mediagoblin-43199340a25ab0aa252796f1c865e9ebf0e96649.tar.lz mediagoblin-43199340a25ab0aa252796f1c865e9ebf0e96649.tar.xz mediagoblin-43199340a25ab0aa252796f1c865e9ebf0e96649.zip | |
Fixed conflict in /auth/views.py.
Diffstat (limited to 'mediagoblin/tests/tools.py')
| -rw-r--r-- | mediagoblin/tests/tools.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py index 308e83ee..cf84da14 100644 --- a/mediagoblin/tests/tools.py +++ b/mediagoblin/tests/tools.py @@ -21,7 +21,7 @@ import os, shutil from paste.deploy import loadapp from webtest import TestApp -from mediagoblin import util +from mediagoblin.tools import testing from mediagoblin.init.config import read_mediagoblin_config from mediagoblin.decorators import _make_safe from mediagoblin.db.open import setup_connection_and_db_from_config @@ -59,7 +59,7 @@ def get_test_app(dump_old_app=True): suicide_if_bad_celery_environ() # Make sure we've turned on testing - util._activate_testing() + testing._activate_testing() # Leave this imported as it sets up celery. from mediagoblin.init.celery import from_tests @@ -117,7 +117,7 @@ def setup_fresh_app(func): """ def wrapper(*args, **kwargs): test_app = get_test_app() - util.clear_test_buckets() + testing.clear_test_buckets() return func(test_app, *args, **kwargs) return _make_safe(wrapper, func) |