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

Used more precise test assertions.

This commit is contained in:
Aymeric Augustin 2013-03-06 15:33:35 +01:00
parent d1a5fe07ed
commit b3aa853ec5
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/select_for_update/tests.py
View File

@ -81,9 +81,6 @@ class SelectForUpdateTests(TransactionTestCase):
sql = tested_connection.queries[-1]['sql'] sql = tested_connection.queries[-1]['sql']
return bool(sql.find(for_update_sql) > -1) return bool(sql.find(for_update_sql) > -1)
def check_exc(self, exc):
self.assertTrue(isinstance(exc, DatabaseError))
@skipUnlessDBFeature('has_select_for_update') @skipUnlessDBFeature('has_select_for_update')
def test_for_update_sql_generated(self): def test_for_update_sql_generated(self):
""" """
@ -129,7 +126,7 @@ class SelectForUpdateTests(TransactionTestCase):
time.sleep(1) time.sleep(1)
thread.join() thread.join()
self.end_blocking_transaction() self.end_blocking_transaction()
self.check_exc(status[-1]) self.assertIsInstance(status[-1], DatabaseError)
# In Python 2.6 beta and some final releases, exceptions raised in __len__ # In Python 2.6 beta and some final releases, exceptions raised in __len__
# are swallowed (Python issue 1242657), so these cases return an empty # are swallowed (Python issue 1242657), so these cases return an empty
@ -261,7 +258,7 @@ class SelectForUpdateTests(TransactionTestCase):
time.sleep(1) time.sleep(1)
thread.join() thread.join()
self.end_blocking_transaction() self.end_blocking_transaction()
self.check_exc(status[-1]) self.assertIsInstance(status[-1], DatabaseError)
@skipUnlessDBFeature('has_select_for_update') @skipUnlessDBFeature('has_select_for_update')
def test_transaction_dirty_managed(self): def test_transaction_dirty_managed(self):