From e9ba8563c115ea331e7fb52b26ddb9cced5c7c94 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 9 Mar 2017 09:55:55 -0500 Subject: [PATCH] [1.11.x] Reverted "Refs #16682 -- Tested transaction.atomic() with KeyboardInterrupt." This reverts commit d895fc9ac01db3d3420aa7c943949fe17b3ce028 since the test is problematic as described in the ticket. Backport of dfbdba924fd7cf12ce92f7a86b97590d25b75733 from master --- tests/transactions/tests.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/tests/transactions/tests.py b/tests/transactions/tests.py index 7dc21cca4f..d2694f2f44 100644 --- a/tests/transactions/tests.py +++ b/tests/transactions/tests.py @@ -1,7 +1,5 @@ from __future__ import unicode_literals -import os -import signal import sys import threading import time @@ -220,18 +218,6 @@ class AtomicTests(TransactionTestCase): transaction.savepoint_rollback(sid) self.assertQuerysetEqual(Reporter.objects.all(), ['']) - @skipIf(sys.platform.startswith('win'), "Windows doesn't have signals.") - def test_rollback_on_keyboardinterrupt(self): - try: - with transaction.atomic(): - Reporter.objects.create(first_name='Tintin') - # Send SIGINT (simulate Ctrl-C). One call isn't enough. - os.kill(os.getpid(), signal.SIGINT) - os.kill(os.getpid(), signal.SIGINT) - except KeyboardInterrupt: - pass - self.assertEqual(Reporter.objects.all().count(), 0) - class AtomicInsideTransactionTests(AtomicTests): """All basic tests for atomic should also pass within an existing transaction."""