p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Russell Keith-Magee 2011-09-10 18:44:33 +00:00
parent 05e29716b4
commit 161c6328a0
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/modeltests/select_for_update/tests.py
View File

@ -101,10 +101,11 @@ class SelectForUpdateTests(TransactionTestCase):
# are swallowed (Python issue 1242657), so these cases return an empty # 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, # list, rather than raising an exception. Not a lot we can do about that,
# unfortunately, due to the way Python handles list() calls internally. # 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 @requires_threading
@skipUnlessDBFeature('has_select_for_update_nowait') @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): def test_nowait_raises_error_on_block(self):
""" """
If nowait is specified, we expect an error to be raised rather If nowait is specified, we expect an error to be raised rather
@ -124,8 +125,15 @@ class SelectForUpdateTests(TransactionTestCase):
self.end_blocking_transaction() self.end_blocking_transaction()
self.check_exc(status[-1]) 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') @skipIfDBFeature('has_select_for_update_nowait')
@skipUnlessDBFeature('has_select_for_update') @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): def test_unsupported_nowait_raises_error(self):
""" """
If a SELECT...FOR UPDATE NOWAIT is run on a database backend If a SELECT...FOR UPDATE NOWAIT is run on a database backend