diff options
| author | Tim Graham <timograham@gmail.com> | 2013-07-13 13:29:11 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-07-14 13:02:55 -0400 |
| commit | 2456ffa42c33d63b54579eae0f5b9cf2a8cd3714 (patch) | |
| tree | 06a8364994fcb6689f39cdf47b0f0372302ee2c5 /tests/select_for_update/tests.py | |
| parent | 0d81fd0e5f44432cbd1efb9b0e655116427dee6e (diff) | |
Fixed #20746 -- Removed Python 2.6 specific code/docs
Diffstat (limited to 'tests/select_for_update/tests.py')
| -rw-r--r-- | tests/select_for_update/tests.py | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/tests/select_for_update/tests.py b/tests/select_for_update/tests.py index b8a8ad19bf..3204d74224 100644 --- a/tests/select_for_update/tests.py +++ b/tests/select_for_update/tests.py @@ -99,15 +99,8 @@ class SelectForUpdateTests(TransactionTestCase): list(Person.objects.all().select_for_update(nowait=True)) self.assertTrue(self.has_for_update_sql(connection, nowait=True)) - # In Python 2.6 beta and some final releases, exceptions raised in __len__ - # are swallowed (Python issue 1242657), so these cases return an empty - # list, rather than raising an exception. Not a lot we can do about that, - # unfortunately, due to the way Python handles list() calls internally. - # Python 2.6.1 is the "in the wild" version affected by this, so we skip - # the test for that version. @requires_threading @skipUnlessDBFeature('has_select_for_update_nowait') - @unittest.skipIf(sys.version_info[:3] == (2, 6, 1), "Python version is 2.6.1") def test_nowait_raises_error_on_block(self): """ If nowait is specified, we expect an error to be raised rather @@ -128,15 +121,8 @@ class SelectForUpdateTests(TransactionTestCase): self.end_blocking_transaction() self.assertIsInstance(status[-1], DatabaseError) - # In Python 2.6 beta and some final releases, exceptions raised in __len__ - # are swallowed (Python issue 1242657), so these cases return an empty - # list, rather than raising an exception. Not a lot we can do about that, - # unfortunately, due to the way Python handles list() calls internally. - # Python 2.6.1 is the "in the wild" version affected by this, so we skip - # the test for that version. @skipIfDBFeature('has_select_for_update_nowait') @skipUnlessDBFeature('has_select_for_update') - @unittest.skipIf(sys.version_info[:3] == (2, 6, 1), "Python version is 2.6.1") def test_unsupported_nowait_raises_error(self): """ If a SELECT...FOR UPDATE NOWAIT is run on a database backend |
