follow ups

mxschmitt · mxschmitt · commit d10e7dbdbfbd · 2021-08-26T22:20:43.000+02:00
diff --git a/playwright/_impl/_browser_type.py b/playwright/_impl/_browser_type.py
@@ -194,9 +194,9 @@ async def connect(
             self._connection._dispatcher_fiber,
             self._connection._object_factory,
             transport,
+            self._connection._loop,
         )
         connection._is_sync = self._connection._is_sync
-        connection._loop = self._connection._loop
         connection._loop.create_task(connection.run())
         playwright_future = connection.get_playwright_future()
 
diff --git a/playwright/_impl/_connection.py b/playwright/_impl/_connection.py
@@ -141,6 +141,7 @@ def __init__(
         dispatcher_fiber: Any,
         object_factory: Callable[[ChannelOwner, str, str, Dict], ChannelOwner],
         transport: Transport,
+        loop: asyncio.AbstractEventLoop,
     ) -> None:
         self._dispatcher_fiber = dispatcher_fiber
         self._transport = transport
@@ -153,7 +154,8 @@ def __init__(
         self._is_sync = False
         self._api_name = ""
         self._child_ws_connections: List["Connection"] = []
-        self._playwright_future: asyncio.Future["Playwright"] = asyncio.Future()
+        self._loop = loop
+        self._playwright_future: asyncio.Future["Playwright"] = loop.create_future()
 
     async def run_as_sync(self) -> None:
         self._is_sync = True
@@ -171,7 +173,7 @@ async def init() -> None:
             self._loop.create_task(init())
             await self._transport.run()
         except Exception:
-            pass
+            await self.stop_async()
 
     def get_playwright_future(self) -> asyncio.Future["Playwright"]:
         return self._playwright_future
diff --git a/playwright/async_api/_context_manager.py b/playwright/async_api/_context_manager.py
@@ -32,8 +32,8 @@ async def __aenter__(self) -> AsyncPlaywright:
             None,
             create_remote_object,
             PipeTransport(loop, compute_driver_executable()),
+            loop,
         )
-        self._connection._loop = loop
         loop.create_task(self._connection.run())
         playwright_future = self._connection.get_playwright_future()
 
diff --git a/playwright/sync_api/_context_manager.py b/playwright/sync_api/_context_manager.py
@@ -56,6 +56,7 @@ def greenlet_main() -> None:
             dispatcher_fiber,
             create_remote_object,
             PipeTransport(loop, compute_driver_executable()),
+            loop,
         )
 
         g_self = greenlet.getcurrent()

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ async def __aenter__(self) -> AsyncPlaywright:`
`32`	`32`	`None,`
`33`	`33`	`create_remote_object,`
`34`	`34`	`PipeTransport(loop, compute_driver_executable()),`
	`35`	`+ loop,`
`35`	`36`	`)`
`36`		`- self._connection._loop = loop`
`37`	`37`	`loop.create_task(self._connection.run())`
`38`	`38`	`playwright_future = self._connection.get_playwright_future()`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ def greenlet_main() -> None:`
`56`	`56`	`dispatcher_fiber,`
`57`	`57`	`create_remote_object,`
`58`	`58`	`PipeTransport(loop, compute_driver_executable()),`
	`59`	`+ loop,`
`59`	`60`	`)`
`60`	`61`
`61`	`62`	`g_self = greenlet.getcurrent()`