Ticket #19665: 19665-1.diff

django/core/management/base.py

@@ -221 +221 @@
         try:
             self.execute(*args, **options.__dict__)
         except Exception as e:
+            stderr = getattr(self, 'stderr', OutputWrapper(sys.stderr, self.style.ERROR))
             if options.traceback:
-                self.stderr.write(traceback.format_exc())
-            self.stderr.write('%s: %s' % (e.__class__.__name__, e))
+                stderr.write(traceback.format_exc())
+            stderr.write('%s: %s' % (e.__class__.__name__, e))
             sys.exit(1)
 
     def execute(self, *args, **options):

tests/regressiontests/admin_scripts/tests.py

@@ -16 +16 @@
 
 from django import conf, bin, get_version
 from django.conf import settings
+from django.core.management import BaseCommand
 from django.db import connection
 from django.test.simple import DjangoTestSuiteRunner
 from django.utils import unittest
 from django.utils.encoding import force_str, force_text
 from django.utils._os import upath
+from django.utils.six import StringIO
 from django.test import LiveServerTestCase
 
 test_dir = os.path.dirname(os.path.dirname(upath(__file__)))
@@ -1279 +1281 @@
         self.assertNoOutput(err)
         self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',), options=[('option_a', 'x'), ('option_b', 'y'), ('option_c', '3'), ('pythonpath', None), ('settings', None), ('traceback', None), ('verbosity', '1')]")
 
+    def test_base_run_from_argv(self):
+        "Test run_from_argv properly terminates even with custom execute() (#19665)"
+        command = BaseCommand()
+        command.execute = lambda *args: args
+
+        old_stderr = sys.stderr
+        sys.stderr = StringIO()
+        try:
+            with self.assertRaises(SystemExit):
+                command.run_from_argv(['', ''])
+        finally:
+            sys.stderr = old_stderr
+
     def test_noargs(self):
         "NoArg Commands can be executed"
         args = ['noargs_command']