aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/tools.py
diff options
context:
space:
mode:
authorAaron Williamson <aaron@copiesofcopies.org>2011-10-01 18:05:44 -0400
committerAaron Williamson <aaron@copiesofcopies.org>2011-10-01 18:05:44 -0400
commit152a3bfaa36d58e44979f217c5799531f780250f (patch)
tree90b7155c2241c5040bd1d3c1bacef9252c1a3d11 /mediagoblin/tests/tools.py
parent03ae172a60a87625e5281eb9766aa5bf3e37d0f4 (diff)
downloadmediagoblin-152a3bfaa36d58e44979f217c5799531f780250f.tar.lz
mediagoblin-152a3bfaa36d58e44979f217c5799531f780250f.tar.xz
mediagoblin-152a3bfaa36d58e44979f217c5799531f780250f.zip
Finished splitting util.py into separate files.
Diffstat (limited to 'mediagoblin/tests/tools.py')
-rw-r--r--mediagoblin/tests/tools.py6
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)