mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-12 13:36:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed #27954 -- Allowed keyboard interrupt to abort queries in PostgreSQL dbshell.

Browse source 
Thanks Tim Martin for review.
This commit is contained in:
Chris Sinchok 2017-04-01 20:01:08 -05:00 • committed by Tim Graham
parent 7bbb5161ea
commit 66150f7cf6
2 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tests/dbshell/test_postgresql_psycopg2.py
View file

@ -1,4 +1,5 @@
import os
import signal
from unittest import mock
from django.db.backends.postgresql.client import DatabaseClient
@ -99,3 +100,17 @@ class PostgreSqlDbshellCommandTestCase(SimpleTestCase):
pgpass_string,
)
)
def test_sigint_handler(self):
"""SIGINT is ignored in Python and passed to psql to abort quries."""
def _mock_subprocess_call(*args):
handler = signal.getsignal(signal.SIGINT)
self.assertEqual(handler, signal.SIG_IGN)
sigint_handler = signal.getsignal(signal.SIGINT)
# The default handler isn't SIG_IGN.
self.assertNotEqual(sigint_handler, signal.SIG_IGN)
with mock.patch('subprocess.check_call', new=_mock_subprocess_call):
DatabaseClient.runshell_db({})
# dbshell restores the orignal handler.
self.assertEqual(sigint_handler, signal.getsignal(signal.SIGINT))