django/daphne
1
1
Fork 0
mirror of https://github.com/django/daphne.git synced 2024-11-21 23:46:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed race-condition with TestApplication pickle file.

Browse Source
This commit is contained in:
Chris Barber 2020-04-14 11:11:45 +02:00 committed by Carlton Gibson
parent 5cf15bd636
commit 1765187a17
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
daphne/testing.py
View File

@ -5,6 +5,7 @@ import pickle
import tempfile import tempfile
import traceback import traceback
from concurrent.futures import CancelledError from concurrent.futures import CancelledError
from functools import partial
class DaphneTestingInstance: class DaphneTestingInstance:
@ -21,6 +22,7 @@ class DaphneTestingInstance:
self.xff = xff self.xff = xff
self.http_timeout = http_timeout self.http_timeout = http_timeout
self.host = "127.0.0.1" self.host = "127.0.0.1"
self.lock = multiprocessing.Lock()
def __enter__(self): def __enter__(self):
# Clear result storage # Clear result storage
@ -38,7 +40,7 @@ class DaphneTestingInstance:
# Start up process # Start up process
self.process = DaphneProcess( self.process = DaphneProcess(
host=self.host, host=self.host,
application=TestApplication, application=partial(TestApplication, lock=self.lock),
kwargs=kwargs, kwargs=kwargs,
setup=self.process_setup, setup=self.process_setup,
teardown=self.process_teardown, teardown=self.process_teardown,
@ -82,7 +84,8 @@ class DaphneTestingInstance:
raises them. raises them.
""" """
try: try:
inner_result = TestApplication.load_result() with self.lock:
inner_result = TestApplication.load_result()
except FileNotFoundError: except FileNotFoundError:
raise ValueError("No results available yet.") raise ValueError("No results available yet.")
# Check for exception # Check for exception
@ -167,8 +170,9 @@ class TestApplication:
setup_storage = os.path.join(tempfile.gettempdir(), "setup.testio") setup_storage = os.path.join(tempfile.gettempdir(), "setup.testio")
result_storage = os.path.join(tempfile.gettempdir(), "result.testio") result_storage = os.path.join(tempfile.gettempdir(), "result.testio")
def __init__(self, scope): def __init__(self, scope, lock):
self.scope = scope self.scope = scope
self.lock = lock
self.messages = [] self.messages = []
async def __call__(self, send, receive): async def __call__(self, send, receive):
@ -178,8 +182,10 @@ class TestApplication:
while True: while True:
# Receive a message and save it into the result store # Receive a message and save it into the result store
self.messages.append(await receive()) self.messages.append(await receive())
self.lock.acquire()
logging.debug("test app received %r", self.messages[-1]) logging.debug("test app received %r", self.messages[-1])
self.save_result(self.scope, self.messages) self.save_result(self.scope, self.messages)
self.lock.release()
# See if there are any messages to send back # See if there are any messages to send back
setup = self.load_setup() setup = self.load_setup()
self.delete_setup() self.delete_setup()