From 826ec5ee57ba798f4706d4fd6f9ffa8b1065508d Mon Sep 17 00:00:00 2001
From: Simon Charette <charette.s@gmail.com>
Date: Thu, 19 May 2016 09:31:49 -0400
Subject: [PATCH] [1.10.x] Refs #24067 -- Fixed contenttypes rename tests
 failures on Oracle.

Broke the initial migration in two to work around #25530 and added
'django.contrib.auth' to the available_apps to make sure its tables are also
flushed as Oracle doesn't implement cascade deletion in sql_flush().

Thanks Tim for the report.

Backport of 722344ee59fb89ea2cd5b906d61b35f76579de4e from master
---
 .../operations_migrations/0001_initial.py     | 18 -----------
 .../operations_migrations/0002_rename_foo.py  | 32 +++++++++++++++++++
 tests/contenttypes_tests/tests.py             |  6 +++-
 3 files changed, 37 insertions(+), 19 deletions(-)
 create mode 100644 tests/contenttypes_tests/operations_migrations/0002_rename_foo.py

diff --git a/tests/contenttypes_tests/operations_migrations/0001_initial.py b/tests/contenttypes_tests/operations_migrations/0001_initial.py
index 0df7a8ef9cf..f08a6a81867 100644
--- a/tests/contenttypes_tests/operations_migrations/0001_initial.py
+++ b/tests/contenttypes_tests/operations_migrations/0001_initial.py
@@ -4,22 +4,6 @@ from __future__ import unicode_literals
 from django.db import migrations, models
 
 
-def assert_foo_contenttype_not_cached(apps, schema_editor):
-    ContentType = apps.get_model('contenttypes', 'ContentType')
-    try:
-        content_type = ContentType.objects.get_by_natural_key('contenttypes_tests', 'foo')
-    except ContentType.DoesNotExist:
-        pass
-    else:
-        if not ContentType.objects.filter(app_label='contenttypes_tests', model='foo').exists():
-            raise AssertionError('The contenttypes_tests.Foo ContentType should not be cached.')
-        elif content_type.model != 'foo':
-            raise AssertionError(
-                "The cached contenttypes_tests.Foo ContentType should have "
-                "its model set to 'foo'."
-            )
-
-
 class Migration(migrations.Migration):
 
     operations = [
@@ -29,6 +13,4 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(primary_key=True)),
             ],
         ),
-        migrations.RenameModel('Foo', 'RenamedFoo'),
-        migrations.RunPython(assert_foo_contenttype_not_cached, migrations.RunPython.noop)
     ]
diff --git a/tests/contenttypes_tests/operations_migrations/0002_rename_foo.py b/tests/contenttypes_tests/operations_migrations/0002_rename_foo.py
new file mode 100644
index 00000000000..34c8cd8a80d
--- /dev/null
+++ b/tests/contenttypes_tests/operations_migrations/0002_rename_foo.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+def assert_foo_contenttype_not_cached(apps, schema_editor):
+    ContentType = apps.get_model('contenttypes', 'ContentType')
+    try:
+        content_type = ContentType.objects.get_by_natural_key('contenttypes_tests', 'foo')
+    except ContentType.DoesNotExist:
+        pass
+    else:
+        if not ContentType.objects.filter(app_label='contenttypes_tests', model='foo').exists():
+            raise AssertionError('The contenttypes_tests.Foo ContentType should not be cached.')
+        elif content_type.model != 'foo':
+            raise AssertionError(
+                "The cached contenttypes_tests.Foo ContentType should have "
+                "its model set to 'foo'."
+            )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes_tests', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameModel('Foo', 'RenamedFoo'),
+        migrations.RunPython(assert_foo_contenttype_not_cached, migrations.RunPython.noop)
+    ]
diff --git a/tests/contenttypes_tests/tests.py b/tests/contenttypes_tests/tests.py
index 7f65fb6f9be..123e169fbc9 100644
--- a/tests/contenttypes_tests/tests.py
+++ b/tests/contenttypes_tests/tests.py
@@ -454,7 +454,11 @@ class ContentTypesMultidbTestCase(TestCase):
     MIGRATION_MODULES=dict(settings.MIGRATION_MODULES, contenttypes_tests='contenttypes_tests.operations_migrations'),
 )
 class ContentTypeOperationsTests(TransactionTestCase):
-    available_apps = ['django.contrib.contenttypes', 'contenttypes_tests']
+    available_apps = [
+        'contenttypes_tests',
+        'django.contrib.contenttypes',
+        'django.contrib.auth',
+    ]
 
     def setUp(self):
         app_config = apps.get_app_config('contenttypes_tests')