Merge pull request #877 from jd/fix-aiohttp-test-race

[aiohttp] Fix race condition in testing

Author: jd

tests/contrib/aiohttp/test_request_safety.py

@@ -68,14 +68,13 @@ def make_requests():
         ctx = self.tracer.get_call_context()
         threads = [threading.Thread(target=make_requests) for _ in range(10)]
         for t in threads:
-            t.daemon = True
             t.start()
 
-        # we should yield so that this loop can handle
-        # threads' requests
-        yield from asyncio.sleep(0.5)
         for t in threads:
-            t.join(timeout=0.5)
+            # we should yield so that this loop can handle
+            # threads' requests
+            yield from asyncio.sleep(0.1)
+            t.join(0.1)
 
         # the trace is wrong but the Context is finished
         traces = self.tracer.writer.pop_traces()