diff options
| author | Aditi <aditi.iitr@gmail.com> | 2013-06-26 22:13:23 +0530 |
|---|---|---|
| committer | Aditi <aditi.iitr@gmail.com> | 2013-06-26 22:13:23 +0530 |
| commit | 054ef9a76a2ca73c0ca3cb8325a01cc981a39ddd (patch) | |
| tree | b8890b62d50cfc20a7d9af7d86d6ceb0a29eb5fd /mediagoblin/tests/test_misc.py | |
| parent | 2719d546a57c2332e36cc056ac80ec5d79672c1a (diff) | |
| parent | 491f2007f5d1f5f595c37491b7f9c0c2b4c93963 (diff) | |
| download | mediagoblin-054ef9a76a2ca73c0ca3cb8325a01cc981a39ddd.tar.lz mediagoblin-054ef9a76a2ca73c0ca3cb8325a01cc981a39ddd.tar.xz mediagoblin-054ef9a76a2ca73c0ca3cb8325a01cc981a39ddd.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
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..43ad0b6d 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, fake_upload=False) + media_b = fixture_media_entry(uploader=user_b.id, save=False, + expunge=False, fake_upload=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"], |