diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-10-01 21:27:36 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-10-01 21:27:36 -0500 |
| commit | b43b17fc2686f5524413a66f8e98f3ab0cc11a60 (patch) | |
| tree | 36fb9cf3155a2ff715b1e93f29be6a17cb2113e9 /mediagoblin/tests/test_messages.py | |
| parent | e27396802caaab9a939c56d19c991339157c493f (diff) | |
| parent | 91e42c467d898ef70dec2d2d34e4173ea771d2ed (diff) | |
| download | mediagoblin-b43b17fc2686f5524413a66f8e98f3ab0cc11a60.tar.lz mediagoblin-b43b17fc2686f5524413a66f8e98f3ab0cc11a60.tar.xz mediagoblin-b43b17fc2686f5524413a66f8e98f3ab0cc11a60.zip | |
Merge remote branch 'remotes/aaronw/bug444_fix_utils_py_redux'
Conflicts:
mediagoblin/util.py
Diffstat (limited to 'mediagoblin/tests/test_messages.py')
| -rw-r--r-- | mediagoblin/tests/test_messages.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/tests/test_messages.py b/mediagoblin/tests/test_messages.py index 9c57a151..2635f4d7 100644 --- a/mediagoblin/tests/test_messages.py +++ b/mediagoblin/tests/test_messages.py @@ -16,7 +16,7 @@ from mediagoblin.messages import fetch_messages, add_message from mediagoblin.tests.tools import setup_fresh_app -from mediagoblin import util +from mediagoblin.tools import template @setup_fresh_app @@ -28,7 +28,7 @@ def test_messages(test_app): """ # Aquire a request object test_app.get('/') - context = util.TEMPLATE_TEST_CONTEXT['mediagoblin/root.html'] + context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/root.html'] request = context['request'] # The message queue should be empty |