Author: russellm
Date: 2011-09-10 11:44:33 -0700 (Sat, 10 Sep 2011)
New Revision: 16784
Modified:
django/trunk/tests/modeltests/select_for_update/tests.py
Log:
Fixed #16490 -- Skipped a test failure that only occurs under Python 2.6.1
(it's the old iteration-eats-exceptions problem).
Modified: django/trunk/tests/modeltests/select_for_update/tests.py
===================================================================
--- django/trunk/tests/modeltests/select_for_update/tests.py 2011-09-10
18:04:27 UTC (rev 16783)
+++ django/trunk/tests/modeltests/select_for_update/tests.py 2011-09-10
18:44:33 UTC (rev 16784)
@@ -101,10 +101,11 @@
# 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 @@
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
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
