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.

1 files changed, 0 insertions, 23 deletions

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