[1.7.x] Fixed #23078 -- Regression in update_contenttypes() interactivity.

Thanks raymond at adaptiv.nl for the report.

Backport of fa3cf006b2 from master

3 files changed, 40 insertions, 1 deletions

diff --git a/AUTHORS b/AUTHORS
index c7d2884e34..cd3d300baa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -548,6 +548,7 @@ answer newbie questions, and generally made Django that much better:
     Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
     Vinay Sajip <vinay_sajip@yahoo.co.uk>
     Bartolome Sanchez Salado <i42sasab@uco.es>
+    Nick Sandford <nick.sandford@gmail.com>
     Mark Sandstrom <mark@deliciouslynerdy.com>
     Kadesarin Sanjek
     Tim Saylor <tim.saylor@gmail.com>
diff --git a/django/contrib/contenttypes/management.py b/django/contrib/contenttypes/management.py
index 0159085d0b..f705330137 100644
--- a/django/contrib/contenttypes/management.py
+++ b/django/contrib/contenttypes/management.py
@@ -60,7 +60,7 @@ def update_contenttypes(app_config, verbosity=2, interactive=True, using=DEFAULT
 
     # Confirm that the content type is stale before deletion.
     if to_remove:
-        if kwargs.get('interactive', False):
+        if interactive:
             content_type_display = '\n'.join(
                 '    %s | %s' % (ct.app_label, ct.model)
                 for ct in to_remove
diff --git a/tests/contenttypes_tests/tests.py b/tests/contenttypes_tests/tests.py
index 085ad2ec89..ee4821ae4b 100644
--- a/tests/contenttypes_tests/tests.py
+++ b/tests/contenttypes_tests/tests.py
@@ -1,16 +1,20 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
 
+import sys
+
 from django.apps.registry import Apps, apps
 from django.contrib.contenttypes.fields import (
     GenericForeignKey, GenericRelation
 )
+from django.contrib.contenttypes import management
 from django.contrib.contenttypes.models import ContentType
 from django.core import checks
 from django.db import models
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.utils.encoding import force_str
+from django.utils.six import StringIO
 
 from .models import Author, Article, SchemeIncludedURL
 
@@ -335,3 +339,37 @@ class GenericRelationshipTests(IsolatedModelsTestCase):
             )
         ]
         self.assertEqual(errors, expected)
+
+
+class UpdateContentTypesTests(TestCase):
+    def setUp(self):
+        self.before_count = ContentType.objects.count()
+        ContentType.objects.create(name='fake', app_label='contenttypes_tests', model='Fake')
+        self.app_config = apps.get_app_config('contenttypes_tests')
+
+    def test_interactive_true(self):
+        """
+        interactive mode of update_contenttypes() (the default) should delete
+        stale contenttypes.
+        """
+        self.old_stdout = sys.stdout
+        sys.stdout = StringIO()
+        management.input = lambda x: force_str("yes")
+        management.update_contenttypes(self.app_config)
+        output = sys.stdout.getvalue()
+        sys.stdout = self.old_stdout
+        self.assertIn("Deleting stale content type", output)
+        self.assertEqual(ContentType.objects.count(), self.before_count)
+
+    def test_interactive_false(self):
+        """
+        non-interactive mode of update_contenttypes() shouldn't delete stale
+        content types.
+        """
+        self.old_stdout = sys.stdout
+        sys.stdout = StringIO()
+        management.update_contenttypes(self.app_config, interactive=False)
+        output = sys.stdout.getvalue()
+        sys.stdout = self.old_stdout
+        self.assertIn("Stale content types remain.", output)
+        self.assertEqual(ContentType.objects.count(), self.before_count + 1)