Fixed test cases.

bartTC · Sep 8, 2009 · 2cb34b9 · 2cb34b9
1 parent dad28e1
commit 2cb34b9
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/django_generic_flatblocks/tests/__init__.py b/django_generic_flatblocks/tests/__init__.py
@@ -13,7 +13,14 @@ def setUp(self):
         dummy_user.first_name = u'John'
         dummy_user.last_naem = u'Doe'
         dummy_user.save()
+
+        self.assertEqual(dummy_user.pk, 1)
+
         self.dummy_user = dummy_user
+
+    def tearDown(self):
+        from django.contrib.auth.models import User
+        User.objects.all().delete()
 
     def parseTemplate(self, template_string):
         t = Template(template_string)
@@ -170,15 +177,15 @@ def testIntoArgument(self):
         self.assertTrue(u'<foo></foo>' in t)
 
 
-        from django.core.exceptions import ObjectDoesNotExist
+        from django.contrib.auth.models import User
-        settings.DEBUG = True
+        settings.TEMPLATE_DEBUG = True
         template_string  = '''
         {% load generic_flatblocks %}
         {% gblock 5 for "auth.User" into "the_user" %}
         <foo>{{ the_user.username }}</foo>
         '''
-        self.assertRaises(ObjectDoesNotExist, self.parseTemplate, template_string)
+        self.assertRaises((User.DoesNotExist, TemplateSyntaxError), self.parseTemplate, template_string)
-        settings.DEBUG = False
+        settings.TEMPLATE_DEBUG = False
 
     def testRelatedObjectDeletion(self):
         template_string  = '''