Fixed #22402 -- Consolidated model_inheritance tests.

The model_inheritance_same_model_name tests couldn't be run without the
model_inheritance tests. Make the problem go away by merging them.

Thanks timo for the report.

3 files changed, 0 insertions, 59 deletions

diff --git a/tests/model_inheritance_same_model_name/__init__.py b/tests/model_inheritance_same_model_name/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/model_inheritance_same_model_name/__init__.py
+++ /dev/null
diff --git a/tests/model_inheritance_same_model_name/models.py b/tests/model_inheritance_same_model_name/models.py
deleted file mode 100644
index a8c051facf..0000000000
--- a/tests/model_inheritance_same_model_name/models.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""
-XX. Model inheritance
-
-Model inheritance across apps can result in models with the same name resulting
-in the need for an %(app_label)s format string. This app specifically tests
-this feature by redefining the Copy model from model_inheritance/models.py
-"""
-
-from django.db import models
-
-from model_inheritance.models import NamedURL
-from django.utils.encoding import python_2_unicode_compatible
-
-
-#
-# Abstract base classes with related models
-#
-@python_2_unicode_compatible
-class Copy(NamedURL):
-    content = models.TextField()
-
-    def __str__(self):
-        return self.content
diff --git a/tests/model_inheritance_same_model_name/tests.py b/tests/model_inheritance_same_model_name/tests.py
deleted file mode 100644
index fe1fb0cdd2..0000000000
--- a/tests/model_inheritance_same_model_name/tests.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from __future__ import unicode_literals
-
-from django.test import TestCase
-
-from model_inheritance.models import Title
-
-
-class InheritanceSameModelNameTests(TestCase):
-
-    def setUp(self):
-        # The Title model has distinct accessors for both
-        # model_inheritance.Copy and model_inheritance_same_model_name.Copy
-        # models.
-        self.title = Title.objects.create(title='Lorem Ipsum')
-
-    def test_inheritance_related_name(self):
-        from model_inheritance.models import Copy
-        self.assertEqual(
-            self.title.attached_model_inheritance_copy_set.create(
-                content='Save $ on V1agr@',
-                url='http://v1agra.com/',
-                title='V1agra is spam',
-            ), Copy.objects.get(content='Save $ on V1agr@'))
-
-    def test_inheritance_with_same_model_name(self):
-        from model_inheritance_same_model_name.models import Copy
-        self.assertEqual(
-            self.title.attached_model_inheritance_same_model_name_copy_set.create(
-                content='The Web framework for perfectionists with deadlines.',
-                url='http://www.djangoproject.com/',
-                title='Django Rocks'
-            ), Copy.objects.get(content='The Web framework for perfectionists with deadlines.'))
-
-    def test_related_name_attribute_exists(self):
-        # The Post model doesn't have an attribute called 'attached_%(app_label)s_%(class)s_set'.
-        self.assertEqual(hasattr(self.title, 'attached_%(app_label)s_%(class)s_set'), False)