gis: Merged revisions 6021-6393 via svnmerge from [repos:django/trunk trunk].

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6394 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 10 insertions, 0 deletions

diff --git a/tests/regressiontests/utils/tests.py b/tests/regressiontests/utils/tests.py
index 258aea697e..fe0b226adc 100644
--- a/tests/regressiontests/utils/tests.py
+++ b/tests/regressiontests/utils/tests.py
@@ -6,6 +6,8 @@ from unittest import TestCase
 
 from django.utils import html
 
+from timesince import timesince_tests
+
 class TestUtilsHtml(TestCase):
 
     def check_output(self, function, value, output=None):
@@ -113,3 +115,11 @@ class TestUtilsHtml(TestCase):
         )
         for value, output in items:
             self.check_output(f, value, output)
+
+__test__ = {
+    'timesince_tests': timesince_tests,
+}
+
+if __name__ == "__main__":
+    import doctest
+    doctest.testmod()