test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned up a test slightly. 

We should catch all exceptions in the thread to ensure it doesn't die
with an unhandled exception. The type of the exception is already
checked further in the test.
This commit is contained in:
Aymeric Augustin 2012-08-18 10:59:10 +02:00
parent 4c1286cf78
commit c03cf0b096
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/regressiontests/backends/tests.py
View File

@ -584,7 +584,7 @@ class ThreadTests(TestCase):
connections['default'] = main_thread_connection connections['default'] = main_thread_connection
try: try:
models.Person.objects.get(first_name="John", last_name="Doe") models.Person.objects.get(first_name="John", last_name="Doe")
except DatabaseError as e: except Exception as e:
exceptions.append(e) exceptions.append(e)
t = threading.Thread(target=runner, args=[connections['default']]) t = threading.Thread(target=runner, args=[connections['default']])
t.start() t.start()
@ -594,21 +594,21 @@ class ThreadTests(TestCase):
exceptions = [] exceptions = []
do_thread() do_thread()
# Forbidden! # Forbidden!
self.assertTrue(isinstance(exceptions[0], DatabaseError)) self.assertIsInstance(exceptions[0], DatabaseError)
# If explicitly setting allow_thread_sharing to False # If explicitly setting allow_thread_sharing to False
connections['default'].allow_thread_sharing = False connections['default'].allow_thread_sharing = False
exceptions = [] exceptions = []
do_thread() do_thread()
# Forbidden! # Forbidden!
self.assertTrue(isinstance(exceptions[0], DatabaseError)) self.assertIsInstance(exceptions[0], DatabaseError)
# If explicitly setting allow_thread_sharing to True # If explicitly setting allow_thread_sharing to True
connections['default'].allow_thread_sharing = True connections['default'].allow_thread_sharing = True
exceptions = [] exceptions = []
do_thread() do_thread()
# All good # All good
self.assertEqual(len(exceptions), 0) self.assertEqual(exceptions, [])
def test_closing_non_shared_connections(self): def test_closing_non_shared_connections(self):
""" """