From cfcf4b3605f9653e4e056088d89932b2a0e4281b Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Mon, 1 Jul 2013 14:22:27 +0200 Subject: Stopped using django.utils.unittest in the test suite. Refs #20680. --- tests/test_runner/test_discover_runner.py | 2 +- tests/test_runner/tests.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/test_runner') diff --git a/tests/test_runner/test_discover_runner.py b/tests/test_runner/test_discover_runner.py index 1a0fb88367..b4f04e8bb0 100644 --- a/tests/test_runner/test_discover_runner.py +++ b/tests/test_runner/test_discover_runner.py @@ -1,10 +1,10 @@ from contextlib import contextmanager import os import sys +from unittest import expectedFailure from django.test import TestCase from django.test.runner import DiscoverRunner -from django.utils.unittest import expectedFailure try: import unittest2 diff --git a/tests/test_runner/tests.py b/tests/test_runner/tests.py index 53a268e823..28ae0833c9 100644 --- a/tests/test_runner/tests.py +++ b/tests/test_runner/tests.py @@ -3,8 +3,9 @@ Tests for django test runner """ from __future__ import absolute_import, unicode_literals -import sys from optparse import make_option +import sys +import unittest from django.core.exceptions import ImproperlyConfigured from django.core.management import call_command @@ -12,7 +13,6 @@ from django import db from django.test import runner, TestCase, TransactionTestCase, skipUnlessDBFeature from django.test.testcases import connections_support_transactions from django.test.utils import IgnoreDeprecationWarningsMixin -from django.utils import unittest from django.utils.importlib import import_module from admin_scripts.tests import AdminScriptTestCase -- cgit v1.3