FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix timeout not being passed around to certain send() calls · microsoft/playwright-python@07834ba · GitHub

/ playwright-python Public

Commit 07834ba

Browse files
agg23
committed
Fix timeout not being passed around to certain send() calls
1 parent 6004e4c commit 07834ba

5 files changed

Lines changed: 32 additions & 14 deletions

File tree

‎playwright/_impl/_clock.py‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,52 +27,66 @@ def __init__(self, browser_context: "BrowserContext") -> None:
2727

2828
async def install(self, time: Union[float, str, datetime.datetime] = None) -> None:
2929
await self._browser_context._channel.send(
30-
"clockInstall", None, parse_time(time) if time is not None else {}
30+
"clockInstall",
31+
self._browser_context._timeout_settings.timeout,
32+
parse_time(time) if time is not None else {},
3133
)
3234

3335
async def fast_forward(
3436
self,
3537
ticks: Union[int, str],
3638
) -> None:
3739
await self._browser_context._channel.send(
38-
"clockFastForward", None, parse_ticks(ticks)
40+
"clockFastForward",
41+
self._browser_context._timeout_settings.timeout,
42+
parse_ticks(ticks),
3943
)
4044

4145
async def pause_at(
4246
self,
4347
time: Union[float, str, datetime.datetime],
4448
) -> None:
4549
await self._browser_context._channel.send(
46-
"clockPauseAt", None, parse_time(time)
50+
"clockPauseAt",
51+
self._browser_context._timeout_settings.timeout,
52+
parse_time(time),
4753
)
4854

4955
async def resume(
5056
self,
5157
) -> None:
52-
await self._browser_context._channel.send("clockResume", None)
58+
await self._browser_context._channel.send(
59+
"clockResume", self._browser_context._timeout_settings.timeout
60+
)
5361

5462
async def run_for(
5563
self,
5664
ticks: Union[int, str],
5765
) -> None:
5866
await self._browser_context._channel.send(
59-
"clockRunFor", None, parse_ticks(ticks)
67+
"clockRunFor",
68+
self._browser_context._timeout_settings.timeout,
69+
parse_ticks(ticks),
6070
)
6171

6272
async def set_fixed_time(
6373
self,
6474
time: Union[float, str, datetime.datetime],
6575
) -> None:
6676
await self._browser_context._channel.send(
67-
"clockSetFixedTime", None, parse_time(time)
77+
"clockSetFixedTime",
78+
self._browser_context._timeout_settings.timeout,
79+
parse_time(time),
6880
)
6981

7082
async def set_system_time(
7183
self,
7284
time: Union[float, str, datetime.datetime],
7385
) -> None:
7486
await self._browser_context._channel.send(
75-
"clockSetSystemTime", None, parse_time(time)
87+
"clockSetSystemTime",
88+
self._browser_context._timeout_settings.timeout,
89+
parse_time(time),
7690
)
7791

7892

‎playwright/_impl/_connection.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ def _augment_params(
648648
) -> Dict:
649649
if params is None:
650650
params = {}
651-
if timeout_calculator is not None:
651+
if timeout_calculator:
652652
params["timeout"] = timeout_calculator(params.get("timeout"))
653653
return _filter_none(params)
654654

‎playwright/_impl/_locator.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ async def focus(self, timeout: float = None) -> None:
383383
async def blur(self, timeout: float = None) -> None:
384384
await self._frame._channel.send(
385385
"blur",
386-
None,
386+
self._frame._timeout,
387387
{
388388
"selector": self._selector,
389389
"strict": True,
@@ -550,7 +550,7 @@ async def screenshot(
550550
async def aria_snapshot(self, timeout: float = None) -> str:
551551
return await self._frame._channel.send(
552552
"ariaSnapshot",
553-
None,
553+
self._frame._timeout,
554554
{
555555
"selector": self._selector,
556556
**locals_to_params(locals()),
@@ -728,7 +728,7 @@ async def _expect(
728728
options["expectedValue"] = serialize_argument(options["expectedValue"])
729729
result = await self._frame._channel.send_return_as_dict(
730730
"expect",
731-
None,
731+
self._frame._timeout,
732732
{
733733
"selector": self._selector,
734734
"expression": expression,

‎playwright/_impl/_selectors.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ async def register(
4646
engine["contentScript"] = contentScript
4747
for context in self._contexts_for_selectors:
4848
await context._channel.send(
49-
"registerSelectorEngine", None, {"selectorEngine": engine}
49+
"registerSelectorEngine",
50+
context._timeout_settings.timeout,
51+
{"selectorEngine": engine},
5052
)
5153
self._selector_engines.append(engine)
5254

@@ -55,5 +57,7 @@ def set_test_id_attribute(self, attributeName: str) -> None:
5557
self._test_id_attribute_name = attributeName
5658
for context in self._contexts_for_selectors:
5759
context._channel.send_no_reply(
58-
"setTestIdAttributeName", None, {"testIdAttributeName": attributeName}
60+
"setTestIdAttributeName",
61+
context._timeout_settings.timeout,
62+
{"testIdAttributeName": attributeName},
5963
)

‎playwright/_impl/_set_input_files_helpers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ async def convert_input_files(
8484
result = await context._connection.wrap_api_call(
8585
lambda: context._channel.send_return_as_dict(
8686
"createTempFiles",
87-
None,
87+
context._timeout_settings.timeout,
8888
{
8989
"rootDirName": (
9090
os.path.basename(local_directory)

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL