1 files changed, 72 insertions, 7 deletions
diff --git a/mediagoblin/tests/test_misc.py b/mediagoblin/tests/test_misc.py
index 94ae5a51..755d863f 100644
--- a/mediagoblin/tests/test_misc.py
+++ b/mediagoblin/tests/test_misc.py
@@ -14,13 +14,78 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-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 fixture_add_user, fixture_media_entry
 
-from mediagoblin.tests.tools import setup_fresh_app
 
-
-@setup_fresh_app
 def test_404_for_non_existent(test_app):
-    assert_equal(test_app.get('/does-not-exist/',
-                              expect_errors=True).status_int,
-                 404)
+    res = test_app.get('/does-not-exist/', expect_errors=True)
+    assert res.status_int == 404
+
+
+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)
+    Session.add(media_a)
+    Session.add(media_b)
+    Session.flush()
+
+    # Create all 4 possible comments:
+    for u_id in (user_a.id, user_b.id):
+        for m_id in (media_a.id, media_b.id):
+            cmt = MediaComment()
+            cmt.media_entry = m_id
+            cmt.author = u_id
+            cmt.content = u"Some Comment"
+            Session.add(cmt)
+
+    Session.flush()
+
+    usr_cnt1 = User.query.count()
+    med_cnt1 = MediaEntry.query.count()
+    cmt_cnt1 = MediaComment.query.count()
+
+    User.query.get(user_a.id).delete(commit=False)
+
+    usr_cnt2 = User.query.count()
+    med_cnt2 = MediaEntry.query.count()
+    cmt_cnt2 = MediaComment.query.count()
+
+    # One user deleted
+    assert usr_cnt2 == usr_cnt1 - 1
+    # One media gone
+    assert med_cnt2 == med_cnt1 - 1
+    # Three of four comments gone.
+    assert cmt_cnt2 == cmt_cnt1 - 3
+
+    User.query.get(user_b.id).delete()
+
+    usr_cnt2 = User.query.count()
+    med_cnt2 = MediaEntry.query.count()
+    cmt_cnt2 = MediaComment.query.count()
+
+    # All users gone
+    assert usr_cnt2 == usr_cnt1 - 2
+    # All media gone
+    assert med_cnt2 == med_cnt1 - 2
+    # All comments gone
+    assert cmt_cnt2 == cmt_cnt1 - 4
+
+
+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.attachment_files.append(dict(
+            name=u"some name",
+            filepath=[u"does", u"not", u"exist"],
+            ))
+    Session.add(media)
+    Session.flush()
+
+    MediaEntry.query.get(media.id).delete()
+    User.query.get(user_a.id).delete()