summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2011-01-26 03:22:16 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2011-01-26 03:22:16 +0000
commit9a317938ef2109da5e8d9cec5ee356d413e7ff47 (patch)
treede5f5058cf5606245ddf9a17b3df3821d3cd22f5
parent1b961e8ee39424c20b6062f56a998722c5864f39 (diff)
Fixed #15154 -- removed doctests from the tests.py generated with createapp.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15314 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/app_template/tests.py17
1 files changed, 5 insertions, 12 deletions
diff --git a/django/conf/app_template/tests.py b/django/conf/app_template/tests.py
index 2247054b35..501deb776c 100644
--- a/django/conf/app_template/tests.py
+++ b/django/conf/app_template/tests.py
@@ -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)