summaryrefslogtreecommitdiff
path: root/tests/test_utils
diff options
context:
space:
mode:
authorMarc Tamlyn <marc.tamlyn@gmail.com>2013-06-14 15:02:30 +0100
committerMarc Tamlyn <marc.tamlyn@gmail.com>2013-06-14 15:37:39 +0100
commit46789e76c68b5713795fbf71ce5fdccb727074fa (patch)
treee5ebddf35699361a0324151e3b7134563a859bab /tests/test_utils
parent5459795ef224c5c81461c06a95d38390ee91f014 (diff)
Fixed #20548 -- Removed all PendingDeprecationWarnings from django test suite
Diffstat (limited to 'tests/test_utils')
-rw-r--r--tests/test_utils/tests.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py
index d72a482819..5f7fb05eb4 100644
--- a/tests/test_utils/tests.py
+++ b/tests/test_utils/tests.py
@@ -8,8 +8,7 @@ from django.http import HttpResponse
from django.template.loader import render_to_string
from django.test import SimpleTestCase, TestCase, skipUnlessDBFeature
from django.test.html import HTMLParseError, parse_html
-from django.test.simple import make_doctest
-from django.test.utils import CaptureQueriesContext
+from django.test.utils import CaptureQueriesContext, IgnorePendingDeprecationWarningsMixin
from django.utils import six
from django.utils import unittest
from django.utils.unittest import skip
@@ -624,9 +623,10 @@ class AssertFieldOutputTests(SimpleTestCase):
self.assertFieldOutput(MyCustomField, {}, {}, empty_value=None)
-class DoctestNormalizerTest(SimpleTestCase):
+class DoctestNormalizerTest(IgnorePendingDeprecationWarningsMixin, SimpleTestCase):
def test_normalizer(self):
+ from django.test.simple import make_doctest
suite = make_doctest("test_utils.doctest_output")
failures = unittest.TextTestRunner(stream=six.StringIO()).run(suite)
self.assertEqual(failures.failures, [])