Hopiu/django-cachalot
1
0
Fork 0
mirror of https://github.com/Hopiu/django-cachalot.git synced 2026-05-20 10:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes two issues in ThreadSafetyTestCase.

Browse source
This commit is contained in:
Bertrand Bordage 2014-10-15 16:32:01 +02:00
parent 3dec971422
commit 6000d3be55
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cachalot/tests.py
View file

@ -1238,23 +1238,25 @@ class SettingsTestCase(TestCase):
class TestThread(Thread):
def __init__(self):
super(TestThread, self).__init__()
self.exit = False
def wait_for_main(self):
self.wait = True
while self.wait:
while self.wait and not self.exit:
sleep(0.001)
def wait_for_child(self):
self.wait = False
while not self.wait:
while not self.wait and not self.exit:
sleep(0.001)
def run(self):
self.wait_for_main()
self.t1 = Test.objects.first()
self.wait_for_main()
self.t2 = Test.objects.first()
self.wait = True
self.wait_for_main()
connection.close()
@ -1265,12 +1267,12 @@ class ThreadSafetyTestCase(TransactionTestCase):
def tearDown(self):
if self.thread.is_alive():
self.thread.join(0)
self.thread.exit = True
self.thread.join()
@skipUnlessDBFeature('test_db_allows_multiple_connections')
def test_concurrent_caching(self):
self.thread.start()
self.thread.wait_for_child()
t = Test.objects.create(name='test')
self.thread.wait_for_child()
@ -1280,11 +1282,11 @@ class ThreadSafetyTestCase(TransactionTestCase):
@skipUnlessDBFeature('test_db_allows_multiple_connections')
def test_concurrent_caching_during_atomic(self):
self.thread.start()
with self.assertNumQueries(1):
with transaction.atomic():
self.thread.start()
self.thread.wait_for_child()
t = Test.objects.create(name='test2')
t = Test.objects.create(name='test')
self.thread.wait_for_child()
self.assertEqual(self.thread.t1, None)