Author: Alex
Date: 2011-01-25 21:22:16 -0600 (Tue, 25 Jan 2011)
New Revision: 15314

Modified:
   django/trunk/django/conf/app_template/tests.py
Log:
Fixed #15154 -- removed doctests from the tests.py generated with createapp.

Modified: django/trunk/django/conf/app_template/tests.py
===================================================================
--- django/trunk/django/conf/app_template/tests.py      2011-01-26 00:58:41 UTC 
(rev 15313)
+++ django/trunk/django/conf/app_template/tests.py      2011-01-26 03:22:16 UTC 
(rev 15314)
@@ -1,23 +1,16 @@
 """
-This file demonstrates two different styles of tests (one doctest and one
-unittest). These will both pass when you run "manage.py test".
+This file demonstrates writing tests using the unittest module. These will pass
+when you run "manage.py test".
 
-Replace these with more appropriate tests for your application.
+Replace this with more appropriate tests for your application.
 """
 
 from django.test import TestCase
 
+
 class SimpleTest(TestCase):
     def test_basic_addition(self):
         """
         Tests that 1 + 1 always equals 2.
         """
-        self.failUnlessEqual(1 + 1, 2)
-
-__test__ = {"doctest": """
-Another way to test that 1 + 1 is equal to 2.
-
->>> 1 + 1 == 2
-True
-"""}
-
+        self.assertEqual(1 + 1, 2)

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to