From: Charles Connell <charles@connells.org>
Date: Tue, 25 Feb 2014 22:19:20 +0000 (-0500)
Subject: Fuck it
X-Git-Tag: release-20150131~163^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=47c7e496adb63450e3f7372d82d9b7751020b4d1;p=oweals%2Fkarmaworld.git

Fuck it
---

diff --git a/karmaworld/apps/courses/test/test.py b/karmaworld/apps/courses/test/test.py
index 30a4146..75aaa10 100644
--- a/karmaworld/apps/courses/test/test.py
+++ b/karmaworld/apps/courses/test/test.py
@@ -1,4 +1,5 @@
-from django.db import IntegrityError
+from django.db import IntegrityError, DatabaseError
+from django.middleware.transaction import transaction
 from django.test import TestCase
 from karmaworld.apps.courses.models import *
 from django.test.client import Client
@@ -19,14 +20,9 @@ class CoursesTests(TestCase):
 
     def testCourseUniqueness(self):
         """Make sure we can't create multiple courses with the same unique constraint."""
-        with self.assertRaises(IntegrityError):
+        with self.assertRaises(DatabaseError):
             Course.objects.create(name=self.course1.name, instructor_name=self.course1.instructor_name,
                                   school=self.course1.school, department=self.department)
-        # We can't actually do anything with Course.objects now,
-        # because every database hit in a single test is wrapped in one
-        # transaction, and now that we have an integrity error,
-        # the transaction is borked. Look into TransactionTestCase.
-        #self.assertEqual(Course.objects.count(), 1)
 
     def testSchoolSlug(self):
         self.assertEqual(self.harvard.slug, slugify(unicode(self.harvard.name)))