Hiding 'cursor does not exist' error doesn't work

[Claude Paroz]

In commit [6b6be692fcd102436c7abef1d7b3fa1d37ad4bdf], Django tries to mask the 'cursor does not exist' exception because it masks the real database exception. Unfortunately, the commit is not fulfilling its promise, as the raise command just after the pass, will in fact raise the second exception (the one we are trying to mask) not the original one.

[Claude Paroz]

Unfortunately, until now, I wasn't able to reproduce the error with the Django test suite. In my project, I had a new model which was not yet migrated, but even with that scenario, I was not able to reproduce on Django. Any help welcome, as I think a test would be really helpful here.

[François Freitag]

Hi Claude,

I have ​a test that's failing before [6b6be692fcd102436c7abef1d7b3fa1d37ad4bdf] and passes after this commit.
Were you able to gather more information about your failure?

[Claude Paroz]

I'm getting that:

======================================================================
ERROR: test_cursor_close_failure_does_not_mask_original_exception (backends.tests.BackendTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/claude/checkouts/django-git/tests/backends/tests.py", line 695, in test_cursor_close_failure_does_not_mask_original_exception
    mock_cursor.execute = mock.MagicMock(side_effect=raise_original_exception)
AttributeError: 'psycopg2.extensions.cursor' object attribute 'execute' is read-only

[François Freitag]

I updated the test because my cursor creation was flawed. I should have used directly connection.chunked_cursor() instead of trying to be smart and use create_cursor().

Fixing this error made the test fail with:

FAIL: test_cursor_close_failure_does_not_mask_original_exception (backends.tests.BackendTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib64/python2.7/unittest/case.py", line 329, in run
    testMethod()
  File "/home/freitafr/dev/django/tests/backends/tests.py", line 700, in test_cursor_close_failure_does_not_mask_original_exception
    list(persons)
  File "/usr/lib64/python2.7/contextlib.py", line 35, in __exit__
    self.gen.throw(type, value, traceback)
  File "/home/freitafr/dev/django/django/test/testcases.py", line 615, in _assert_raises_message_cm
    self.assertIn(expected_message, str(cm.exception))
  File "/usr/lib64/python2.7/unittest/case.py", line 803, in assertIn
    self.fail(self._formatMessage(msg, standardMsg))
  File "/usr/lib64/python2.7/unittest/case.py", line 410, in fail
    raise self.failureException(msg)
AssertionError: u'Real exception raised by the database on cursor.execute' not found in 'Error when attempting to close the cursor, would mask the actual exception'

I opened ​#8371 with a suggested way to fix this issue.

[Claude Paroz <claude@…>]

In 56746fb2:

[1.11.x] Fixed #28091 -- Re-raised original exception when closing cursor cleanup fails

[Tim Graham <timograham@…>]

In c9d933ba:

[1.11.x] Refs #28091 -- Fixed typo and rephrased 1.11.1 release note.

[Tim Graham <timograham@…>]

In 8b767986:

Refs #28091 -- Forwardported 1.11.1 release note.