summaryrefslogtreecommitdiff
path: root/tests/test_runner
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test_runner')
-rw-r--r--tests/test_runner/test_discover_runner.py2
-rw-r--r--tests/test_runner/tests.py4
2 files changed, 3 insertions, 3 deletions
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