diff --git a/tests/model_fields/tests.py b/tests/model_fields/tests.py index eee3f31532..e4cc880bd6 100644 --- a/tests/model_fields/tests.py +++ b/tests/model_fields/tests.py @@ -18,7 +18,6 @@ from django.db.models.fields import ( from django.db.models.fields.files import FileField, ImageField from django.utils import six from django.utils.functional import lazy -from django.utils.unittest import skipIf from .models import ( Foo, Bar, Whiz, BigD, BigS, BigInt, Post, NullBooleanModel, @@ -517,7 +516,7 @@ class PromiseTest(test.TestCase): AutoField(primary_key=True).get_prep_value(lazy_func()), int) - @skipIf(six.PY3, "Python 3 has no `long` type.") + @unittest.skipIf(six.PY3, "Python 3 has no `long` type.") def test_BigIntegerField(self): lazy_func = lazy(lambda: long(9999999999999999999), long) self.assertIsInstance( diff --git a/tests/schema/tests.py b/tests/schema/tests.py index 03c5d79387..959f886024 100644 --- a/tests/schema/tests.py +++ b/tests/schema/tests.py @@ -1,7 +1,8 @@ from __future__ import absolute_import import datetime +import unittest + from django.test import TransactionTestCase -from django.utils.unittest import skipUnless from django.db import connection, DatabaseError, IntegrityError from django.db.models.fields import IntegerField, TextField, CharField, SlugField from django.db.models.fields.related import ManyToManyField, ForeignKey @@ -17,7 +18,7 @@ class SchemaTests(TransactionTestCase): as sometimes the code to check if a test has worked is almost as complex as the code it is testing. """ - + available_apps = [] models = [Author, AuthorWithM2M, Book, BookWithSlug, BookWithM2M, Tag, TagIndexed, TagM2MTest, TagUniqueRename, UniqueTest] @@ -91,7 +92,7 @@ class SchemaTests(TransactionTestCase): lambda: list(Author.objects.all()), ) - @skipUnless(connection.features.supports_foreign_keys, "No FK support") + @unittest.skipUnless(connection.features.supports_foreign_keys, "No FK support") def test_fk(self): "Tests that creating tables out of FK order, then repointing, works" # Create the table @@ -310,7 +311,7 @@ class SchemaTests(TransactionTestCase): BookWithM2M._meta.local_many_to_many.remove(new_field) del BookWithM2M._meta._m2m_cache - @skipUnless(connection.features.supports_check_constraints, "No check constraints") + @unittest.skipUnless(connection.features.supports_check_constraints, "No check constraints") def test_check_constraints(self): """ Tests creating/deleting CHECK constraints