summaryrefslogtreecommitdiff
path: root/django/test/__init__.py
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-10-11 12:55:17 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-10-11 12:55:17 +0000
commit121d2e36785dc0ce8e7d1c48883fc7b719b21afc (patch)
tree7cddebe1474071a6fed69767378fc3433fd39dbb /django/test/__init__.py
parent1070c57b83efdfd4fbed09280fcdaafc6d9c1a81 (diff)
Fixed #12991 -- Added unittest2 support. Thanks to PaulM for the draft patch, and to Luke, Karen, Justin, Alex, Łukasz Rekucki, and Chuck Harmston for their help testing and reviewing the final patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/test/__init__.py')
-rw-r--r--django/test/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/test/__init__.py b/django/test/__init__.py
index c996ed49d6..b3198fcf88 100644
--- a/django/test/__init__.py
+++ b/django/test/__init__.py
@@ -3,5 +3,5 @@ Django Unit Test and Doctest framework.
"""
from django.test.client import Client
-from django.test.testcases import TestCase, TransactionTestCase
+from django.test.testcases import TestCase, TransactionTestCase, skipIfDBFeature, skipUnlessDBFeature
from django.test.utils import Approximate