diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-06-22 16:13:41 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-06-22 16:13:41 -0500 |
| commit | 257b8ab62a6a5e04d60575a9766e5ed3503a15ed (patch) | |
| tree | 5d998fd1b955cb180ad1010c07ec35b1fd945b1b /mediagoblin/tests/test_misc.py | |
| parent | 75ee3de301e7bea30c40fe26d857bb6cc7878f82 (diff) | |
| parent | 0c7fa7556ced34444db82d2d2d3b51b4f5327586 (diff) | |
| download | mediagoblin-257b8ab62a6a5e04d60575a9766e5ed3503a15ed.tar.lz mediagoblin-257b8ab62a6a5e04d60575a9766e5ed3503a15ed.tar.xz mediagoblin-257b8ab62a6a5e04d60575a9766e5ed3503a15ed.zip | |
Merge remote-tracking branch 'refs/remotes/joar/notifications'
Conflicts:
mediagoblin/db/migrations.py
Diffstat (limited to 'mediagoblin/tests/test_misc.py')
| -rw-r--r-- | mediagoblin/tests/test_misc.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mediagoblin/tests/test_misc.py b/mediagoblin/tests/test_misc.py index 755d863f..6af6bf92 100644 --- a/mediagoblin/tests/test_misc.py +++ b/mediagoblin/tests/test_misc.py @@ -28,8 +28,10 @@ def test_user_deletes_other_comments(test_app): user_a = fixture_add_user(u"chris_a") user_b = fixture_add_user(u"chris_b") - media_a = fixture_media_entry(uploader=user_a.id, save=False) - media_b = fixture_media_entry(uploader=user_b.id, save=False) + media_a = fixture_media_entry(uploader=user_a.id, save=False, + expunge=False) + media_b = fixture_media_entry(uploader=user_b.id, save=False, + expunge=False) Session.add(media_a) Session.add(media_b) Session.flush() @@ -79,7 +81,7 @@ def test_user_deletes_other_comments(test_app): 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) + media = fixture_media_entry(uploader=user_a.id, save=False, expunge=False) media.attachment_files.append(dict( name=u"some name", filepath=[u"does", u"not", u"exist"], |