More timeout handling

Author: agg23

playwright/_impl/_browser_type.py

@@ -35,6 +35,7 @@
 )
 from playwright._impl._errors import Error
 from playwright._impl._helper import (
+    PLAYWRIGHT_MAX_DEADLINE,
     ColorScheme,
     Contrast,
     Env,
@@ -210,7 +211,6 @@ async def connect(
         if slowMo is None:
             slowMo = 0
 
-        timeout = timeout if timeout is not None else 0
         headers = {**(headers if headers else {}), "x-playwright-browser": self.name}
         local_utils = self._connection.local_utils
         pipe_channel = (
@@ -220,7 +220,7 @@ async def connect(
                     "wsEndpoint": wsEndpoint,
                     "headers": headers,
                     "slowMo": slowMo,
-                    "timeout": timeout,
+                    "timeout": timeout if timeout is not None else 0,
                     "exposeNetwork": exposeNetwork,
                 },
             )
@@ -260,7 +260,10 @@ def handle_transport_close(reason: Optional[str]) -> None:
         connection._loop.create_task(connection.run())
         playwright_future = connection.playwright_future
 
-        timeout_future = throw_on_timeout(timeout, Error("Connection timed out"))
+        timeout_future = throw_on_timeout(
+            timeout if timeout is not None else PLAYWRIGHT_MAX_DEADLINE,
+            Error("Connection timed out"),
+        )
         done, pending = await asyncio.wait(
             {transport.on_error_future, playwright_future, timeout_future},
             return_when=asyncio.FIRST_COMPLETED,

playwright/_impl/_element_handle.py

@@ -213,7 +213,7 @@ async def set_input_files(
         await self._channel.send(
             "setInputFiles",
             {
-                "timeout": timeout,
+                "timeout": self._frame._timeout(timeout),
                 **converted,
             },
         )

playwright/_impl/_frame.py

@@ -739,7 +739,7 @@ async def set_input_files(
             {
                 "selector": selector,
                 "strict": strict,
-                "timeout": timeout,
+                "timeout": self._timeout(timeout),
                 **converted,
             },
         )

playwright/_impl/_helper.py

@@ -252,6 +252,7 @@ class HarLookupResult(TypedDict, total=False):
 
 DEFAULT_PLAYWRIGHT_TIMEOUT_IN_MILLISECONDS = 30000
 DEFAULT_PLAYWRIGHT_LAUNCH_TIMEOUT_IN_MILLISECONDS = 180000
+PLAYWRIGHT_MAX_DEADLINE = 2147483647  # 2^31-1
 
 
 class TimeoutSettings:

playwright/_impl/_locator.py

@@ -141,7 +141,7 @@ async def check(
         noWaitAfter: bool = None,
         trial: bool = None,
     ) -> None:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.check(self._selector, strict=True, **params)
 
     async def click(
@@ -156,7 +156,7 @@ async def click(
         noWaitAfter: bool = None,
         trial: bool = None,
     ) -> None:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.click(self._selector, strict=True, **params)
 
     async def dblclick(
@@ -170,7 +170,7 @@ async def dblclick(
         noWaitAfter: bool = None,
         trial: bool = None,
     ) -> None:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.dblclick(self._selector, strict=True, **params)
 
     async def dispatch_event(
@@ -179,7 +179,7 @@ async def dispatch_event(
         eventInit: Dict = None,
         timeout: float = None,
     ) -> None:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.dispatch_event(self._selector, strict=True, **params)
 
     async def evaluate(
@@ -191,7 +191,7 @@ async def evaluate(
         )
 
     async def evaluate_all(self, expression: str, arg: Serializable = None) -> Any:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.eval_on_selector_all(self._selector, **params)
 
     async def evaluate_handle(
@@ -208,7 +208,7 @@ async def fill(
         noWaitAfter: bool = None,
         force: bool = None,
     ) -> None:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.fill(self._selector, strict=True, **params)
 
     async def clear(
@@ -311,7 +311,7 @@ async def element_handle(
         self,
         timeout: float = None,
     ) -> ElementHandle:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         handle = await self._frame.wait_for_selector(
             self._selector, strict=True, state="attached", **params
         )
@@ -377,7 +377,7 @@ def and_(self, locator: "Locator") -> "Locator":
         )
 
     async def focus(self, timeout: float = None) -> None:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.focus(self._selector, strict=True, **params)
 
     async def blur(self, timeout: float = None) -> None:
@@ -413,14 +413,14 @@ async def drag_to(
         sourcePosition: Position = None,
         targetPosition: Position = None,
     ) -> None:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         del params["target"]
         return await self._frame.drag_and_drop(
             self._selector, target._selector, strict=True, **params
         )
 
     async def get_attribute(self, name: str, timeout: float = None) -> Optional[str]:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.get_attribute(
             self._selector,
             strict=True,
@@ -436,79 +436,79 @@ async def hover(
         force: bool = None,
         trial: bool = None,
     ) -> None:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.hover(
             self._selector,
             strict=True,
             **params,
         )
 
     async def inner_html(self, timeout: float = None) -> str:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.inner_html(
             self._selector,
             strict=True,
             **params,
         )
 
     async def inner_text(self, timeout: float = None) -> str:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.inner_text(
             self._selector,
             strict=True,
             **params,
         )
 
     async def input_value(self, timeout: float = None) -> str:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.input_value(
             self._selector,
             strict=True,
             **params,
         )
 
     async def is_checked(self, timeout: float = None) -> bool:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.is_checked(
             self._selector,
             strict=True,
             **params,
         )
 
     async def is_disabled(self, timeout: float = None) -> bool:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.is_disabled(
             self._selector,
             strict=True,
             **params,
         )
 
     async def is_editable(self, timeout: float = None) -> bool:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.is_editable(
             self._selector,
             strict=True,
             **params,
         )
 
     async def is_enabled(self, timeout: float = None) -> bool:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.is_enabled(
             self._selector,
             strict=True,
             **params,
         )
 
     async def is_hidden(self, timeout: float = None) -> bool:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.is_hidden(
             self._selector,
             strict=True,
             **params,
         )
 
     async def is_visible(self, timeout: float = None) -> bool:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.is_visible(
             self._selector,
             strict=True,
@@ -522,7 +522,7 @@ async def press(
         timeout: float = None,
         noWaitAfter: bool = None,
     ) -> None:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.press(self._selector, strict=True, **params)
 
     async def screenshot(
@@ -539,7 +539,7 @@ async def screenshot(
         maskColor: str = None,
         style: str = None,
     ) -> bytes:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._with_element(
             lambda h, timeout: h.screenshot(
                 **{**params, "timeout": timeout},
@@ -574,15 +574,15 @@ async def select_option(
         noWaitAfter: bool = None,
         force: bool = None,
     ) -> List[str]:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.select_option(
             self._selector,
             strict=True,
             **params,
         )
 
     async def select_text(self, force: bool = None, timeout: float = None) -> None:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._with_element(
             lambda h, timeout: h.select_text(**{**params, "timeout": timeout}),
             timeout,
@@ -600,7 +600,7 @@ async def set_input_files(
         timeout: float = None,
         noWaitAfter: bool = None,
     ) -> None:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.set_input_files(
             self._selector,
             strict=True,
@@ -616,15 +616,15 @@ async def tap(
         noWaitAfter: bool = None,
         trial: bool = None,
     ) -> None:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.tap(
             self._selector,
             strict=True,
             **params,
         )
 
     async def text_content(self, timeout: float = None) -> Optional[str]:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.text_content(
             self._selector,
             strict=True,
@@ -638,7 +638,7 @@ async def type(
         timeout: float = None,
         noWaitAfter: bool = None,
     ) -> None:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.type(
             self._selector,
             strict=True,
@@ -662,7 +662,7 @@ async def uncheck(
         noWaitAfter: bool = None,
         trial: bool = None,
     ) -> None:
-        params = locals_to_params(locals())
+        params = self._locals_to_params_with_timeout(locals())
         return await self._frame.uncheck(
             self._selector,
             strict=True,
@@ -859,6 +859,11 @@ def nth(self, index: int) -> "FrameLocator":
     def __repr__(self) -> str:
         return f"<FrameLocator frame={self._frame!r} selector={self._frame_selector!r}>"
 
+    def _locals_to_params_with_timeout(self, args: Dict) -> Dict:
+        params = locals_to_params(args)
+        params["timeout"] = self._frame._timeout(params.get("timeout"))
+        return params
+
 
 _test_id_attribute_name: str = "data-testid"