Commit cfcf4b36 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Stopped using django.utils.unittest in the test suite.

Refs #20680.
parent 7f264e02
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
import os
from unittest import SkipTest

from django.test import LiveServerTestCase
from django.utils.module_loading import import_by_path
from django.utils.unittest import SkipTest
from django.utils.translation import ugettext as _


+2 −1
Original line number Diff line number Diff line
from __future__ import absolute_import, unicode_literals

import unittest

from django.contrib.admindocs import views
from django.db import models
from django.db.models import fields
from django.utils import unittest
from django.utils.translation import ugettext as _


+3 −2
Original line number Diff line number Diff line
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

import unittest
from unittest import skipUnless

from django.conf.global_settings import PASSWORD_HASHERS as default_hashers
from django.contrib.auth.hashers import (is_password_usable, BasePasswordHasher,
    check_password, make_password, PBKDF2PasswordHasher, load_hashers, PBKDF2SHA1PasswordHasher,
    get_hasher, identify_hasher, UNUSABLE_PASSWORD_PREFIX, UNUSABLE_PASSWORD_SUFFIX_LENGTH)
from django.utils import six
from django.utils import unittest
from django.utils.unittest import skipUnless


try:
+2 −2
Original line number Diff line number Diff line
import sys
from datetime import date, timedelta
import sys
import unittest

from django.conf import settings
from django.contrib.auth.models import User
from django.contrib.auth.tokens import PasswordResetTokenGenerator
from django.contrib.auth.tests.utils import skipIfCustomUser
from django.test import TestCase
from django.utils import unittest


@skipIfCustomUser
+2 −1
Original line number Diff line number Diff line
from unittest import skipIf

from django.conf import settings
from django.utils.unittest import skipIf


def skipIfCustomUser(test_func):
Loading