added artifacts/video remote handling

mxschmitt · mxschmitt · commit 3349e4d97274 · 2021-04-23T17:45:23.000+02:00
diff --git a/playwright/_impl/_page.py b/playwright/_impl/_page.py
@@ -29,6 +29,7 @@
     ViewportSize,
 )
 from playwright._impl._api_types import Error
+from playwright._impl._artifact import Artifact
 from playwright._impl._connection import (
     ChannelOwner,
     from_channel,
@@ -285,7 +286,9 @@ def _on_dialog(self, params: Any) -> None:
     def _on_download(self, params: Any) -> None:
         url = params["url"]
         suggested_filename = params["suggestedFilename"]
-        artifact = from_channel(params["artifact"])
+        artifact = cast(Artifact, from_channel(params["artifact"]))
+        if self._browser_context._browser:
+            artifact._is_remote = self._browser_context._browser._is_remote
         self.emit(
             Page.Events.Download, Download(self, url, suggested_filename, artifact)
         )
diff --git a/playwright/_impl/_video.py b/playwright/_impl/_video.py
@@ -28,6 +28,10 @@ def __init__(self, page: "Page") -> None:
         self._dispatcher_fiber = page._dispatcher_fiber
         self._page = page
         self._artifact_future = page._loop.create_future()
+        if page.context.browser:
+            self._is_remote = page.context.browser._is_remote
+        else:
+            self._is_remote = False
         if page.is_closed():
             self._page_closed()
         else:
@@ -42,9 +46,14 @@ def _page_closed(self) -> None:
 
     def _artifact_ready(self, artifact: Artifact) -> None:
         if not self._artifact_future.done():
+            artifact._is_remote = self._is_remote
             self._artifact_future.set_result(artifact)
 
     async def path(self) -> pathlib.Path:
+        if self._is_remote:
+            raise Error(
+                "Path is not available when using browserType.connect(). Use save_as() to save a local copy."
+            )
         artifact = await self._artifact_future
         if not artifact:
             raise Error("Page did not produce any video frames")
diff --git a/tests/async/test_browsertype_connect.py b/tests/async/test_browsertype_connect.py
@@ -138,6 +138,47 @@ async def test_browser_type_connect_should_reject_navigation_when_browser_closes
         await page.goto(server.PREFIX + "/one-style.html")
     assert "Playwright connection closed" in exc_info.value.message
 
-    with pytest.raises(Error) as exc_info:
-        await page.goto(server.PREFIX + "/one-style.html")
-    assert "Playwright connection closed" in exc_info.value.message
+
+async def test_should_not_allow_getting_the_path(
+    browser_type: BrowserType, launch_server, server: Server
+):
+    def handle_download(request):
+        request.setHeader("Content-Type", "application/octet-stream")
+        request.setHeader("Content-Disposition", "attachment")
+        request.write(b"Hello world")
+        request.finish()
+
+    server.set_route("/download", handle_download)
+
+    remote_server = launch_server()
+    browser = await browser_type.connect(remote_server.ws_endpoint)
+    page = await browser.new_page(accept_downloads=True)
+    await page.set_content(f'<a href="{server.PREFIX}/download">download</a>')
+    async with page.expect_download() as download_info:
+        await page.click("a")
+    download = await download_info.value
+    with pytest.raises(Error) as exc:
+        await download.path()
+    assert (
+        exc.value.message
+        == "Path is not available when using browser_type.connect(). Use save_as() to save a local copy."
+    )
+    remote_server.kill()
+
+
+async def test_prevent_getting_video_path(
+    browser_type: BrowserType, launch_server, tmpdir, server
+):
+    remote_server = launch_server()
+    browser = await browser_type.connect(remote_server.ws_endpoint)
+    page = await browser.new_page(record_video_dir=tmpdir)
+    await page.goto(server.PREFIX + "/grid.html")
+    await browser.close()
+    assert page.video
+    with pytest.raises(Error) as exc:
+        await page.video.path()
+    assert (
+        exc.value.message
+        == "Path is not available when using browserType.connect(). Use save_as() to save a local copy."
+    )
+    remote_server.kill()
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -249,12 +249,12 @@ def kill(self):
 def launch_server(browser_name: str, launch_arguments: Dict, tmp_path: Path):
     remotes: List[RemoteServer] = []
 
-    def _launch_server(override_launch_options: Dict = {}):
+    def _launch_server(**kwargs: Dict):
         remote = RemoteServer(
             browser_name,
             {
                 **launch_arguments,
-                **override_launch_options,
+                **kwargs,
             },
             tmp_path / f"settings-{len(remotes)}.json",
         )

Original file line number	Diff line number	Diff line change
`@@ -249,12 +249,12 @@ def kill(self):`
`249`	`249`	`def launch_server(browser_name: str, launch_arguments: Dict, tmp_path: Path):`
`250`	`250`	`remotes: List[RemoteServer] = []`
`251`	`251`
`252`		`- def _launch_server(override_launch_options: Dict = {}):`
	`252`	`+ def _launch_server(**kwargs: Dict):`
`253`	`253`	`remote = RemoteServer(`
`254`	`254`	`browser_name,`
`255`	`255`	`{`
`256`	`256`	`**launch_arguments,`
`257`		`- **override_launch_options,`
	`257`	`+ **kwargs,`
`258`	`258`	`},`
`259`	`259`	`tmp_path / f"settings-{len(remotes)}.json",`
`260`	`260`	`)`