From a08fda2111d811aa53f11218fa03f3300dfff4cb Mon Sep 17 00:00:00 2001
From: Simon Charette <charette.s@gmail.com>
Date: Tue, 17 Nov 2015 00:39:28 -0500
Subject: Fixed #25746 -- Isolated inlined test models registration.

Thanks to Tim for the review.
---
 tests/auth_tests/models/__init__.py       | 10 +++-------
 tests/auth_tests/models/invalid_models.py | 18 ------------------
 2 files changed, 3 insertions(+), 25 deletions(-)

(limited to 'tests/auth_tests/models')

diff --git a/tests/auth_tests/models/__init__.py b/tests/auth_tests/models/__init__.py
index ec6b6099db..3f3bd89793 100644
--- a/tests/auth_tests/models/__init__.py
+++ b/tests/auth_tests/models/__init__.py
@@ -1,14 +1,10 @@
 from .custom_permissions import CustomPermissionsUser
-from .invalid_models import (
-    CustomUserBadRequiredFields, CustomUserNonListRequiredFields,
-    CustomUserNonUniqueUsername,
-)
+from .invalid_models import CustomUserNonUniqueUsername
 from .is_active import IsActiveTestUser1
 from .uuid_pk import UUIDUser
 from .with_foreign_key import CustomUserWithFK, Email
 
 __all__ = (
-    'CustomPermissionsUser', 'CustomUserNonUniqueUsername',
-    'CustomUserNonListRequiredFields', 'CustomUserBadRequiredFields',
-    'CustomUserWithFK', 'Email', 'IsActiveTestUser1', 'UUIDUser',
+    'CustomPermissionsUser', 'CustomUserWithFK', 'Email',
+    'IsActiveTestUser1', 'UUIDUser', 'CustomUserNonUniqueUsername',
 )
diff --git a/tests/auth_tests/models/invalid_models.py b/tests/auth_tests/models/invalid_models.py
index 4e2307ea59..123ed4d865 100644
--- a/tests/auth_tests/models/invalid_models.py
+++ b/tests/auth_tests/models/invalid_models.py
@@ -18,21 +18,3 @@ class CustomUserNonUniqueUsername(AbstractBaseUser):
     REQUIRED_FIELDS = ['email']
 
     objects = UserManager()
-
-
-class CustomUserNonListRequiredFields(AbstractBaseUser):
-    "A user with a non-list REQUIRED_FIELDS"
-    username = models.CharField(max_length=30, unique=True)
-    date_of_birth = models.DateField()
-
-    USERNAME_FIELD = 'username'
-    REQUIRED_FIELDS = 'date_of_birth'
-
-
-class CustomUserBadRequiredFields(AbstractBaseUser):
-    "A user with a USERNAME_FIELD that appears in REQUIRED_FIELDS (invalid)"
-    username = models.CharField(max_length=30, unique=True)
-    date_of_birth = models.DateField()
-
-    USERNAME_FIELD = 'username'
-    REQUIRED_FIELDS = ['username', 'date_of_birth']
-- 
cgit v1.3