Refs django#2333 - Modified runtests script to use new testing framework. Migrated existing tests to use Django testing framework. All the 'othertests' have been migrated into 'regressiontests', and converted into doctests/unittests, as appropriate.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3661 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Author: freakboy3742

tests/doctest.py

@@ -13,8 +13,7 @@ class Article(models.Model):
     def __str__(self):
         return self.headline
 
-API_TESTS = """
-
+__test__ = {'API_TESTS': """
 # No articles are in the system yet.
 >>> Article.objects.all()
 []
@@ -314,14 +313,14 @@ def __str__(self):
 >>> Article.objects.all()
 [<Article: Article 6>, <Article: Default headline>, <Article: Article 7>, <Article: Updated article 8>]
 
-"""
+"""}
 
 from django.conf import settings
 
 building_docs = getattr(settings, 'BUILDING_DOCS', False)
 
 if building_docs or settings.DATABASE_ENGINE == 'postgresql':
-    API_TESTS += """
+    __test__['API_TESTS'] += """
 # In PostgreSQL, microsecond-level precision is available.
 >>> a9 = Article(headline='Article 9', pub_date=datetime(2005, 7, 31, 12, 30, 45, 180))
 >>> a9.save()
@@ -330,7 +329,7 @@ def __str__(self):
 """
 
 if building_docs or settings.DATABASE_ENGINE == 'mysql':
-    API_TESTS += """
+    __test__['API_TESTS'] += """
 # In MySQL, microsecond-level precision isn't available. You'll lose
 # microsecond-level precision once the data is saved.
 >>> a9 = Article(headline='Article 9', pub_date=datetime(2005, 7, 31, 12, 30, 45, 180))
@@ -339,7 +338,7 @@ def __str__(self):
 datetime.datetime(2005, 7, 31, 12, 30, 45)
 """
 
-API_TESTS += """
+__test__['API_TESTS'] += """
 
 # You can manually specify the primary key when creating a new object.
 >>> a101 = Article(id=101, headline='Article 101', pub_date=datetime(2005, 7, 31, 12, 30, 45))

tests/modeltests/basic/models.py

@@ -23,7 +23,7 @@ class Person(models.Model):
     def __str__(self):
         return self.name
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 >>> a = Person(name='Adrian', gender='M')
 >>> a.save()
 >>> s = Person(name='Sara', gender='F')
@@ -36,4 +36,4 @@ def __str__(self):
 'Male'
 >>> s.get_gender_display()
 'Female'
-"""
+"""}

tests/modeltests/choices/models.py

@@ -15,7 +15,7 @@ class Person(models.Model):
     def __str__(self):
         return '%s %s' % (self.first_name, self.last_name)
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 # Create a Person.
 >>> p = Person(first_name='John', last_name='Smith')
 >>> p.save()
@@ -50,4 +50,4 @@ def __str__(self):
 Traceback (most recent call last):
     ...
 AttributeError: 'Person' object has no attribute 'last'
-"""
+"""}

tests/modeltests/custom_columns/models.py

@@ -58,7 +58,7 @@ class Car(models.Model):
     def __str__(self):
         return self.name
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 >>> p1 = Person(first_name='Bugs', last_name='Bunny', fun=True)
 >>> p1.save()
 >>> p2 = Person(first_name='Droopy', last_name='Dog', fun=False)
@@ -104,4 +104,4 @@ def __str__(self):
 # to the first manager defined in the class. In this case, it's "cars".
 >>> Car._default_manager.order_by('name')
 [<Car: Corvette>, <Car: Neon>]
-"""
+"""}

tests/modeltests/custom_managers/models.py

@@ -36,7 +36,7 @@ def articles_from_same_day_2(self):
         # positional arguments to Article().
         return [self.__class__(*row) for row in cursor.fetchall()]
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 # Create a couple of Articles.
 >>> from datetime import date
 >>> a = Article(id=None, headline='Area man programs in Python', pub_date=date(2005, 7, 27))
@@ -55,4 +55,4 @@ def articles_from_same_day_2(self):
 [<Article: Area man programs in Python>]
 >>> b.articles_from_same_day_2()
 [<Article: Area man programs in Python>]
-"""
+"""}

tests/modeltests/custom_methods/models.py

@@ -27,7 +27,7 @@ class Meta:
     def __str__(self):
         return self.name
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 >>> dan = Employee(employee_code='ABC123', first_name='Dan', last_name='Jones')
 >>> dan.save()
 >>> Employee.objects.all()
@@ -88,4 +88,4 @@ def __str__(self):
 >>> Business.objects.filter(employees__first_name__startswith='Fran')
 [<Business: Sears>]
 
-"""
+"""}

tests/modeltests/custom_pk/models.py

@@ -10,7 +10,7 @@
 class Empty(models.Model):
     pass
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 >>> m = Empty()
 >>> m.id
 >>> m.save()
@@ -23,4 +23,4 @@ class Empty(models.Model):
 >>> existing = Empty(m.id)
 >>> existing.save()
 
-"""
+"""}

tests/modeltests/empty/models.py

@@ -19,7 +19,7 @@ class Article(models.Model):
     def __str__(self):
         return self.headline
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 >>> from datetime import datetime
 
 # No articles are in the system yet.
@@ -48,4 +48,4 @@ def __str__(self):
 >>> d = now - a.pub_date
 >>> d.seconds < 5
 True
-"""
+"""}

tests/modeltests/field_defaults/models.py

@@ -53,7 +53,7 @@ class Mineral(models.Model):
     def __str__(self):
         return self.name
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 # Create the world in 7 lines of code...
 >>> lion = Animal(common_name="Lion", latin_name="Panthera leo")
 >>> platypus = Animal(common_name="Platypus", latin_name="Ornithorhynchus anatinus")
@@ -105,4 +105,4 @@ def __str__(self):
 [<TaggedItem: shiny>]
 >>> TaggedItem.objects.filter(content_type__pk=ctype.id, object_id=quartz.id)
 [<TaggedItem: clearish>]
-"""
+"""}

tests/modeltests/generic_relations/models.py

@@ -29,7 +29,7 @@ class Person(models.Model):
     def __str__(self):
         return self.name
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 # Because no Articles exist yet, get_latest() raises ArticleDoesNotExist.
 >>> Article.objects.latest()
 Traceback (most recent call last):
@@ -76,4 +76,4 @@ def __str__(self):
 
 >>> Person.objects.latest('birthday')
 <Person: Stephanie>
-"""
+"""}

tests/modeltests/get_latest/models.py

@@ -15,7 +15,7 @@ class Person(models.Model):
     def __str__(self):
         return '%s %s' % (self.first_name, self.last_name)
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 # Acting as a divine being, create an Person.
 >>> from datetime import date
 >>> p = Person(first_name='John', last_name='Lennon', birthday=date(1940, 10, 9))
@@ -49,4 +49,4 @@ def __str__(self):
 False
 >>> Person.objects.count()
 2
-"""
+"""}

tests/modeltests/get_or_create/models.py

@@ -78,7 +78,7 @@ class SelfClashM2M(models.Model):
 
 
 
-error_log = """invalid_models.fielderrors: "charfield": CharFields require a "maxlength" attribute.
+model_errors = """invalid_models.fielderrors: "charfield": CharFields require a "maxlength" attribute.
 invalid_models.fielderrors: "floatfield": FloatFields require a "decimal_places" attribute.
 invalid_models.fielderrors: "floatfield": FloatFields require a "max_digits" attribute.
 invalid_models.fielderrors: "filefield": FileFields require an "upload_to" attribute.

tests/modeltests/invalid_models/models.py

@@ -15,7 +15,7 @@ class Meta:
     def __str__(self):
         return self.headline
 
-API_TESTS = r"""
+__test__ = {'API_TESTS':r"""
 # Create a couple of Articles.
 >>> from datetime import datetime
 >>> a1 = Article(headline='Article 1', pub_date=datetime(2005, 7, 26))
@@ -191,4 +191,4 @@ def __str__(self):
 >>> Article.objects.filter(headline__contains='\\')
 [<Article: Article with \ backslash>]
 
-"""
+"""}

tests/modeltests/lookup/models.py

@@ -21,7 +21,7 @@ class Meta:
         ordering = ('num',)
 
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 >>> Issue.objects.all()
 []
 >>> r = User(username='russell')
@@ -62,4 +62,4 @@ class Meta:
 [<Issue: 1>, <Issue: 2>, <Issue: 3>]
 >>> Issue.objects.filter(Q(client=r.id) | Q(cc__id__exact=r.id))
 [<Issue: 1>, <Issue: 2>, <Issue: 3>]
-"""
+"""}

tests/modeltests/m2m_and_m2o/models.py

@@ -34,7 +34,7 @@ class Writer(models.Model):
     def __str__(self):
         return '%s (%s)' % (self.reporter, self.position)
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 # Create a few Reporters.
 >>> r1 = Reporter(first_name='John', last_name='Smith')
 >>> r1.save()
@@ -65,4 +65,4 @@ def __str__(self):
 <Article: This is a test>
 >>> r1.writer_set.all()
 [<Writer: John Smith (Main writer)>]
-"""
+"""}

tests/modeltests/m2m_intermediary/models.py

@@ -28,7 +28,7 @@ class Meta:
     def __str__(self):
         return self.headline
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 >>> from datetime import datetime
 
 >>> c1 = Category(name='Sports')
@@ -76,4 +76,4 @@ def __str__(self):
 []
 >>> c4.secondary_article_set.all()
 [<Article: Area man steals>, <Article: Area man runs>]
-"""
+"""}

tests/modeltests/m2m_multiple/models.py

@@ -22,7 +22,7 @@ class Person(models.Model):
     def __str__(self):
         return self.name
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 >>> a = Person(name='Anne')
 >>> a.save()
 >>> b = Person(name='Bill')
@@ -189,4 +189,4 @@ def __str__(self):
 >>> d.stalkers.all()
 [<Person: Chuck>]
 
-"""
+"""}

tests/modeltests/m2m_recursive/models.py

@@ -19,7 +19,7 @@ class Category(models.Model):
     def __str__(self):
         return self.name
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 # Create a few Category objects.
 >>> r = Category(id=None, name='Root category', parent=None)
 >>> r.save()
@@ -37,4 +37,4 @@ def __str__(self):
 []
 >>> c.parent
 <Category: Root category>
-"""
+"""}

tests/modeltests/m2o_recursive/models.py

@@ -17,7 +17,7 @@ class Person(models.Model):
     def __str__(self):
         return self.full_name
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 # Create two Person objects -- the mom and dad in our family.
 >>> dad = Person(full_name='John Smith Senior', mother=None, father=None)
 >>> dad.save()
@@ -40,4 +40,4 @@ def __str__(self):
 []
 >>> kid.fathers_child_set.all()
 []
-"""
+"""}

tests/modeltests/m2o_recursive2/models.py

@@ -21,7 +21,7 @@ class Album(models.Model):
     def __str__(self):
         return self.name
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 >>> from django.utils.datastructures import MultiValueDict
 
 # Create a Musician object via the default AddManipulator.
@@ -88,4 +88,4 @@ def __str__(self):
 <Album: Ultimate Ella>
 >>> a2.release_date
 datetime.date(2005, 2, 13)
-"""
+"""}

tests/modeltests/manipulators/models.py

@@ -28,7 +28,7 @@ def __str__(self):
     class Meta:
         ordering = ('headline',)
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 # Create a couple of Publications.
 >>> p1 = Publication(id=None, title='The Python Journal')
 >>> p1.save()
@@ -231,4 +231,4 @@ class Meta:
 >>> p1.article_set.all()
 [<Article: NASA uses Python>]
 
-"""
+"""}

tests/modeltests/many_to_many/models.py

@@ -25,7 +25,7 @@ def __str__(self):
     class Meta:
         ordering = ('headline',)
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 # Create a few Reporters.
 >>> r = Reporter(first_name='John', last_name='Smith', email='[email protected]')
 >>> r.save()
@@ -263,4 +263,4 @@ class Meta:
 >>> Article.objects.all()
 []
 
-"""
+"""}

tests/modeltests/many_to_one/models.py

@@ -23,7 +23,7 @@ class Meta:
     def __str__(self):
         return self.headline
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 # Create a Reporter.
 >>> r = Reporter(name='John Smith')
 >>> r.save()
@@ -121,4 +121,4 @@ def __str__(self):
 >>> Article.objects.filter(reporter__isnull=True)
 [<Article: First>, <Article: Fourth>]
 
-"""
+"""}

tests/modeltests/many_to_one_null/models.py

@@ -26,7 +26,7 @@ class ItalianRestaurant(Restaurant):
     def __str__(self):
         return "%s the italian restaurant" % self.name
 
-API_TESTS = """
+__test__ = {'API_TESTS':"""
 # Make sure Restaurant has the right fields in the right order.
 >>> [f.name for f in Restaurant._meta.fields]
 ['id', 'name', 'address', 'serves_hot_dogs', 'serves_pizza']
@@ -50,4 +50,4 @@ def __str__(self):
 >>> ir.save()
 
 
-"""
+"""}