diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-04-04 19:44:36 -0500 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-04-04 19:44:36 -0500 |
commit | fe6755f0f44e1148e2cb72538f8e64c4a9740f7f (patch) | |
tree | c241564789e8c4b11440b248af548de6b5a7c286 /mediagoblin/tests/test_misc.py | |
parent | 39a71c09d7fbc991d8045341facb2bef8c838b5b (diff) | |
parent | 5c2ece7401723486d76ea0fcd2f99ba4d1002504 (diff) | |
download | mediagoblin-fe6755f0f44e1148e2cb72538f8e64c4a9740f7f.tar.lz mediagoblin-fe6755f0f44e1148e2cb72538f8e64c4a9740f7f.tar.xz mediagoblin-fe6755f0f44e1148e2cb72538f8e64c4a9740f7f.zip |
Merge branch '614_multi_test_config'
Diffstat (limited to 'mediagoblin/tests/test_misc.py')
-rw-r--r-- | mediagoblin/tests/test_misc.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/mediagoblin/tests/test_misc.py b/mediagoblin/tests/test_misc.py index b20262cf..7143938e 100644 --- a/mediagoblin/tests/test_misc.py +++ b/mediagoblin/tests/test_misc.py @@ -18,18 +18,15 @@ from nose.tools import assert_equal from mediagoblin.db.base import Session from mediagoblin.db.models import User, MediaEntry, MediaComment -from mediagoblin.tests.tools import get_app, \ - fixture_add_user, fixture_media_entry +from mediagoblin.tests.tools import fixture_add_user, fixture_media_entry -def test_404_for_non_existent(): - test_app = get_app(dump_old_app=False) +def test_404_for_non_existent(test_app): res = test_app.get('/does-not-exist/', expect_errors=True) assert_equal(res.status_int, 404) -def test_user_deletes_other_comments(): - get_app() # gotta init the db and etc +def test_user_deletes_other_comments(test_app): user_a = fixture_add_user(u"chris_a") user_b = fixture_add_user(u"chris_b") @@ -81,8 +78,7 @@ def test_user_deletes_other_comments(): assert_equal(cmt_cnt2, cmt_cnt1 - 4) -def test_media_deletes_broken_attachment(): - get_app() # gotta init the db and etc +def test_media_deletes_broken_attachment(test_app): user_a = fixture_add_user(u"chris_a") media = fixture_media_entry(uploader=user_a.id, save=False) |