Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #16490 -- Skipped a test failure that only occurs under Python …

…2.6.1 (it's the old iteration-eats-exceptions problem).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16784 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 161c6328a0811280926a16275be5ef4164f5866f 1 parent 05e2971
@freakboy3742 freakboy3742 authored
Showing with 10 additions and 2 deletions.
  1. +10 −2 tests/modeltests/select_for_update/tests.py
View
12 tests/modeltests/select_for_update/tests.py
@@ -101,10 +101,11 @@ def test_for_update_sql_generated_nowait(self):
# 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.
- # Thus, we skip this test for Python 2.6.
+ # 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[:2] == (2, 6), "Python version is 2.6")
+ @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
@@ -124,8 +125,15 @@ def test_nowait_raises_error_on_block(self):
self.end_blocking_transaction()
self.check_exc(status[-1])
+ # 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

0 comments on commit 161c632

Please sign in to comment.
Something went wrong with that request. Please try again.