more tests

mxschmitt · mxschmitt · commit 0e136aee37cc · 2022-06-15T14:49:43.000+02:00
diff --git a/playwright/_impl/_connection.py b/playwright/_impl/_connection.py
@@ -141,7 +141,7 @@ def _dispose(self) -> None:
 
 class ProtocolCallback:
     def __init__(self, loop: asyncio.AbstractEventLoop) -> None:
-        self.stack_trace: traceback.StackSummary = traceback.StackSummary()
+        self.stack_trace: traceback.StackSummary
         self.future = loop.create_future()
         # The outer task can get cancelled by the user, this forwards the cancellation to the inner task.
         current_task = asyncio.current_task()
@@ -252,10 +252,10 @@ def _send_message_to_server(
         id = self._last_id
         callback = ProtocolCallback(self._loop)
         task = asyncio.current_task(self._loop)
-        stack_trace: Optional[traceback.StackSummary] = getattr(
-            task, "__pw_stack_trace__", None
+        callback.stack_trace = cast(
+            traceback.StackSummary,
+            getattr(task, "__pw_stack_trace__", traceback.extract_stack()),
         )
-        callback.stack_trace = stack_trace or traceback.extract_stack()
         self._callbacks[id] = callback
         message = {
             "id": id,
diff --git a/playwright/_impl/_sync_base.py b/playwright/_impl/_sync_base.py
@@ -14,6 +14,7 @@
 
 import asyncio
 import inspect
+import traceback
 from types import TracebackType
 from typing import Any, Awaitable, Callable, Dict, Generic, List, Type, TypeVar, cast
 
@@ -79,6 +80,7 @@ def _sync(self, coro: Awaitable) -> Any:
         g_self = greenlet.getcurrent()
         task = self._loop.create_task(coro)
         setattr(task, "__pw_stack__", inspect.stack())
+        setattr(task, "__pw_stack_trace__", traceback.extract_stack())
 
         task.add_done_callback(lambda _: g_self.switch())
         while not task.done():
diff --git a/tests/async/test_tracing.py b/tests/async/test_tracing.py
@@ -103,8 +103,8 @@ async def test_should_collect_trace_with_resources_but_no_js(
     assert events_have_entry(events, "Keyboard.insert_text") is True
     assert events_have_entry(events, "Page.close") is True
 
-    assert len(list(filter(lambda e: e["type"] == "frame-snapshot", events))) > 1
-    assert len(list(filter(lambda e: e["type"] == "screencast-frame", events))) > 1
+    assert len(list(filter(lambda e: e["type"] == "frame-snapshot", events))) >= 1
+    assert len(list(filter(lambda e: e["type"] == "screencast-frame", events))) >= 1
     style = list(
         filter(
             lambda e: e["type"] == "resource-snapshot"
diff --git a/tests/sync/test_page.py b/tests/sync/test_page.py
@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from playwright.sync_api import Page
+import pytest
+
+from playwright.sync_api import Error, Page
 from tests.server import Server
 
 
@@ -66,3 +68,11 @@ def test_should_set_bodysize_to_0(page: Page, server: Server) -> None:
     sizes = request.sizes()
     assert sizes["requestBodySize"] == 0
     assert sizes["requestHeadersSize"] >= 200
+
+
+def test_sync_stacks_should_work(page: Page, server: Server) -> None:
+    page.route("**/empty.html", lambda route: route.abort())
+    with pytest.raises(Error) as exc_info:
+        page.goto(server.EMPTY_PAGE)
+    assert exc_info.value.stack
+    assert __file__ in exc_info.value.stack
diff --git a/tests/sync/test_tracing.py b/tests/sync/test_tracing.py
@@ -78,6 +78,119 @@ def test_should_collect_sources(
     assert found_current_file
 
 
+def test_should_collect_trace_with_resources_but_no_js(
+    context: BrowserContext, page: Page, server: Server, tmpdir: Path
+) -> None:
+    context.tracing.start(screenshots=True, snapshots=True)
+    page.goto(server.PREFIX + "/frames/frame.html")
+    page.set_content("<button>Click</button>")
+    page.click('"Click"')
+    page.mouse.move(20, 20)
+    page.mouse.dblclick(30, 30)
+    page.keyboard.insert_text("abc")
+    page.wait_for_timeout(2000)  # Give it some time to produce screenshots.
+    page.close()
+    trace_file_path = tmpdir / "trace.zip"
+    context.tracing.stop(path=trace_file_path)
+
+    (_, events) = parse_trace(trace_file_path)
+    assert events[0]["type"] == "context-options"
+    assert events_have_entry(events, "Page.goto") is True
+    assert events_have_entry(events, "Page.set_content") is True
+    assert events_have_entry(events, "Page.click") is True
+    assert events_have_entry(events, "Mouse.move") is True
+    assert events_have_entry(events, "Mouse.dblclick") is True
+    assert events_have_entry(events, "Keyboard.insert_text") is True
+    assert events_have_entry(events, "Page.close") is True
+
+    assert len(list(filter(lambda e: e["type"] == "frame-snapshot", events))) >= 1
+    assert len(list(filter(lambda e: e["type"] == "screencast-frame", events))) >= 1
+    style = list(
+        filter(
+            lambda e: e["type"] == "resource-snapshot"
+            and e["snapshot"]["request"]["url"].endswith("style.css"),
+            events,
+        )
+    )[0]
+    assert style
+    assert style["snapshot"]["response"]["content"]["_sha1"]
+    script = list(
+        filter(
+            lambda e: e["type"] == "resource-snapshot"
+            and e["snapshot"]["request"]["url"].endswith("script.js"),
+            events,
+        )
+    )[0]
+    assert script
+    assert script["snapshot"]["response"]["content"].get("_sha1") is None
+
+
+def test_should_collect_two_traces(
+    context: BrowserContext, page: Page, server: Server, tmpdir: Path
+) -> None:
+    context.tracing.start(screenshots=True, snapshots=True)
+    page.goto(server.EMPTY_PAGE)
+    page.set_content("<button>Click</button>")
+    page.click('"Click"')
+    tracing1_path = tmpdir / "trace1.zip"
+    context.tracing.stop(path=tracing1_path)
+
+    context.tracing.start(screenshots=True, snapshots=True)
+    page.dblclick('"Click"')
+    page.close()
+    tracing2_path = tmpdir / "trace2.zip"
+    context.tracing.stop(path=tracing2_path)
+
+    (_, events) = parse_trace(tracing1_path)
+    assert events[0]["type"] == "context-options"
+    assert events_have_entry(events, "Page.goto") is True
+    assert events_have_entry(events, "Page.set_content") is True
+    assert events_have_entry(events, "Page.click") is True
+    assert events_have_entry(events, "Page.dblclick") is False
+    assert events_have_entry(events, "Page.close") is False
+
+    (_, events) = parse_trace(tracing2_path)
+    assert events[0]["type"] == "context-options"
+    assert events_have_entry(events, "Page.goto") is False
+    assert events_have_entry(events, "Page.set_content") is False
+    assert events_have_entry(events, "Page.click") is False
+    assert events_have_entry(events, "Page.dblclick") is True
+    assert events_have_entry(events, "Page.close") is True
+
+
+def test_should_not_throw_when_stopping_without_start_but_not_exporting(
+    context: BrowserContext,
+) -> None:
+    context.tracing.stop()
+
+
+def test_should_work_with_playwright_context_managers(
+    context: BrowserContext, page: Page, server: Server, tmpdir: Path
+) -> None:
+    context.tracing.start(screenshots=True, snapshots=True)
+    page.goto(server.EMPTY_PAGE)
+    page.set_content("<button>Click</button>")
+    with page.expect_console_message() as message_info:
+        page.evaluate('() => console.log("hello")')
+        page.click('"Click"')
+    assert (message_info.value).text == "hello"
+
+    with page.expect_popup():
+        page.evaluate("window._popup = window.open(document.location.href)")
+    trace_file_path = tmpdir / "trace.zip"
+    context.tracing.stop(path=trace_file_path)
+
+    (_, events) = parse_trace(trace_file_path)
+    assert events[0]["type"] == "context-options"
+    assert events_have_entry(events, "Page.goto")
+    assert events_have_entry(events, "Page.set_content")
+    assert events_have_entry(events, "Page.expect_console_message")
+    assert events_have_entry(events, "Page.evaluate")
+    assert events_have_entry(events, "Page.click")
+    assert events_have_entry(events, "Page.expect_popup")
+    assert events_have_entry(events, "Page.evaluate")
+
+
 def parse_trace(path: Path) -> Tuple[Dict[str, bytes], List[Any]]:
     resources: Dict[str, bytes] = {}
     with zipfile.ZipFile(path, "r") as zip:
@@ -88,3 +201,7 @@ def parse_trace(path: Path) -> Tuple[Dict[str, bytes], List[Any]]:
         for line in resources[name].decode().splitlines():
             events.append(json.loads(line))
     return (resources, events)
+
+
+def events_have_entry(events: List[Any], api_name: str) -> bool:
+    return any(e.get("metadata", {}).get("apiName") == api_name for e in events)
