Ticket #12364: ticket_12364.patch

django/test/simple.py

@@ +1 @@
+import signal
 import unittest
+
 from django.conf import settings
 from django.db.models import get_app, get_apps
 from django.test import _doctest as doctest
@@ -15 +17 @@
     def __init__(self, verbosity=0, failfast=False, **kwargs):
         super(DjangoTestRunner, self).__init__(verbosity=verbosity, **kwargs)
         self.failfast = failfast
+        # We'll assume that the user hasn't yet typed CTRL-C :)
+        self._keyboard_interrupt_intercepted = False
+
+    def run(self, *args, **kwargs):
+        """
+        We override the run method, for the purposes of registering our custom signal handler for the KEYBOARD INTERRUPT.
+        """
+        # Let's remember the old keyboard interrupt, so we can replace it after run
+        self._default_keyboard_interrupt_handler = signal.signal(signal.SIGINT, self._keyboard_interrupt_handler)
+        result = super(DjangoTestRunner, self).run(*args, **kwargs)
+        # Replace the keyboard interrupt handler
+        signal.signal(signal.SIGINT, self._default_keyboard_interrupt_handler)
+        return result
+
+    def _keyboard_interrupt_handler(self, signal_number, stack_frame):
+        """
+        This method will be called when a user types CTRL-C, once it is registered as a handler for CTRL-C.
+        """
+        self._keyboard_interrupt_intercepted = True
+        # Let's set the interrupt handler back to the default handler, so that if the user presses CTRL-C again, they can kill the test
+        # suite.
+        signal.signal(signal.SIGINT, self._default_keyboard_interrupt_handler)
         
     def _makeResult(self):
         result = super(DjangoTestRunner, self)._makeResult()
@@ -22 +46 @@
         
         def stoptest_override(func):
             def stoptest(test):
-                if failfast and not result.wasSuccessful():
+                # If we were set to failfast and the unit test failed, or if the user has typed CTRL-C, let's report and quit
+                if (failfast and not result.wasSuccessful()) or self._keyboard_interrupt_intercepted:
                     result.stop()
                 func(test)
             return stoptest

docs/ref/django-admin.txt

@@ -694 +694 @@
 .. django-admin:: test
 
 Runs tests for all installed models. See :ref:`topics-testing` for more
-information.
+information. If you send a keyboard interrupt (CTRL-C) to the running test
+suite, the currently running unit test will complete, and the test suite will
+then halt, reporting to you any errors you've come across so far. This is very
+useful if you have forgotten to pass the --failfast flag. If you don't wish to
+wait for the current unit test to complete for whatever reason, you can send an
+additional keyboard interrupt to stop it immediately.
 
 --failfast
 ~~~~~~~~~~