Skip to content

Commit 6cb0ce4

Browse files
mxschmittmxschmitt
authored
tests: added skipped tests back (#92)
1 parent 2343ff1 commit 6cb0ce4

File tree

14 files changed

+48
-38
lines changed

14 files changed

+48
-38
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 🎭 Playwright for Python
22

3-
[![PyPI version](https://badge.fury.io/py/playwright.svg)](https://pypi.python.org/pypi/playwright/) [![Join Slack](https://img.shields.io/badge/join-slack-infomational)](https://join.slack.com/t/playwright/shared_invite/enQtOTEyMTUxMzgxMjIwLThjMDUxZmIyNTRiMTJjNjIyMzdmZDA3MTQxZWUwZTFjZjQwNGYxZGM5MzRmNzZlMWI5ZWUyOTkzMjE5Njg1NDg) <!-- GEN:chromium-version-badge -->[![Chromium version](https://img.shields.io/badge/chromium-86.0.4209.0-blue.svg?logo=google-chrome)](https://www.chromium.org/Home)<!-- GEN:stop --> <!-- GEN:firefox-version-badge -->[![Firefox version](https://img.shields.io/badge/firefox-78.0b5-blue.svg?logo=mozilla-firefox)](https://www.mozilla.org/en-US/firefox/new/)<!-- GEN:stop --> [![WebKit version](https://img.shields.io/badge/webkit-14.0-blue.svg?logo=safari)](https://webkit.org/)
3+
[![PyPI version](https://badge.fury.io/py/playwright.svg)](https://pypi.python.org/pypi/playwright/) [![Join Slack](https://img.shields.io/badge/join-slack-infomational)](https://join.slack.com/t/playwright/shared_invite/enQtOTEyMTUxMzgxMjIwLThjMDUxZmIyNTRiMTJjNjIyMzdmZDA3MTQxZWUwZTFjZjQwNGYxZGM5MzRmNzZlMWI5ZWUyOTkzMjE5Njg1NDg) <!-- GEN:chromium-version-badge -->[![Chromium version](https://img.shields.io/badge/chromium-86.0.4211.0-blue.svg?logo=google-chrome)](https://www.chromium.org/Home)<!-- GEN:stop --> <!-- GEN:firefox-version-badge -->[![Firefox version](https://img.shields.io/badge/firefox-78.0b5-blue.svg?logo=mozilla-firefox)](https://www.mozilla.org/en-US/firefox/new/)<!-- GEN:stop --> [![WebKit version](https://img.shields.io/badge/webkit-14.0-blue.svg?logo=safari)](https://webkit.org/)
44
[![Coverage Status](https://coveralls.io/repos/github/microsoft/playwright-python/badge.svg?branch=master)](https://coveralls.io/github/microsoft/playwright-python?branch=master)
55

66
##### [Docs](https://github.com/microsoft/playwright/blob/master/docs/README.md) | [API reference](https://github.com/microsoft/playwright/blob/master/docs/api.md)
@@ -9,7 +9,7 @@ Playwright is a Python library to automate [Chromium](https://www.chromium.org/H
99

1010
| | Linux | macOS | Windows |
1111
| :--- | :---: | :---: | :---: |
12-
| Chromium <!-- GEN:chromium-version -->86.0.4209.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
12+
| Chromium <!-- GEN:chromium-version -->86.0.4211.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
1313
| WebKit 14.0 | ✅ | ✅ | ✅ |
1414
| Firefox <!-- GEN:firefox-version -->78.0b5<!-- GEN:stop --> | ✅ | ✅ | ✅ |
1515

‎driver/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "Apache-2.0",
1515
"dependencies": {
16-
"playwright": "1.2.0-next.1595486491367"
16+
"playwright": "1.2.0-next.1595625808301"
1717
},
1818
"devDependencies": {
1919
"pkg": "^4.4.9"

‎local-requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pytest==5.4.3
22
pytest-asyncio==0.14.0
33
pytest-cov==2.10.0
44
pytest-sugar==0.9.4
5-
pytest-xdist==1.32.0
5+
pytest-xdist==1.33.0
66
mypy==0.782
77
setuptools==49.1.0
88
twisted==20.3.0

‎playwright/browser_type.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ async def launch(
4747
proxy: Dict = None,
4848
downloadsPath: str = None,
4949
slowMo: int = None,
50+
chromiumSandbox: bool = None,
5051
) -> Browser:
5152
return from_channel(
5253
await self._channel.send("launch", locals_to_params(locals()))
@@ -67,6 +68,7 @@ async def launchServer(
6768
proxy: Dict = None,
6869
downloadsPath: str = None,
6970
port: int = None,
71+
chromiumSandbox: bool = None,
7072
) -> Browser:
7173
return from_channel(
7274
await self._channel.send("launchServer", locals_to_params(locals()))

‎playwright/connection.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,12 @@ async def send(
3838
result = await self._scope.send_message_to_server(self._guid, method, params)
3939
# Protocol now has named return values, assume result is one level deeper unless
4040
# there is explicit ambiguity.
41-
if unpack_first_key and isinstance(result, dict) and len(result) == 1:
42-
key = next(iter(result))
43-
return result[key]
41+
if unpack_first_key and isinstance(result, dict) and len(result) <= 1:
42+
if len(result) == 1:
43+
key = next(iter(result))
44+
return result[key]
45+
else:
46+
return None
4447
return result
4548

4649
def send_no_reply(self, method: str, params: dict = None) -> None:

‎playwright/drivers/browsers.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"browsers": [
44
{
55
"name": "chromium",
6-
"revision": "790602"
6+
"revision": "791201"
77
},
88
{
99
"name": "firefox",
10-
"revision": "1137"
10+
"revision": "1140"
1111
},
1212
{
1313
"name": "webkit",
14-
"revision": "1308"
14+
"revision": "1317"
1515
}
1616
]
1717
}

‎playwright/frame.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def _on_frame_navigated(self, event: FrameNavigatedEvent) -> None:
8989
self._url = event["url"]
9090
self._name = event["name"]
9191
self._event_emitter.emit("navigated", event)
92-
if "error" not in event and self._page:
92+
if "error" not in event and hasattr(self, "_page") and self._page:
9393
self._page.emit("framenavigated", self)
9494

9595
async def goto(

‎playwright/sync.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2610,6 +2610,7 @@ def launch(
26102610
proxy: typing.Dict = None,
26112611
downloadsPath: str = None,
26122612
slowMo: int = None,
2613+
chromiumSandbox: bool = None,
26132614
) -> "Browser":
26142615
return Browser._from_async(
26152616
self._sync(
@@ -2627,6 +2628,7 @@ def launch(
26272628
proxy=proxy,
26282629
downloadsPath=downloadsPath,
26292630
slowMo=slowMo,
2631+
chromiumSandbox=chromiumSandbox,
26302632
)
26312633
)
26322634
)
@@ -2646,6 +2648,7 @@ def launchServer(
26462648
proxy: typing.Dict = None,
26472649
downloadsPath: str = None,
26482650
port: int = None,
2651+
chromiumSandbox: bool = None,
26492652
) -> "Browser":
26502653
return Browser._from_async(
26512654
self._sync(
@@ -2663,6 +2666,7 @@ def launchServer(
26632666
proxy=proxy,
26642667
downloadsPath=downloadsPath,
26652668
port=port,
2669+
chromiumSandbox=chromiumSandbox,
26662670
)
26672671
)
26682672
)

‎tests/conftest.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ def browser_type(browser_name: str):
5959

6060
@pytest.fixture(scope="session")
6161
def launch_arguments(pytestconfig):
62-
return {"headless": not pytestconfig.getoption("--headful")}
62+
return {
63+
"headless": not pytestconfig.getoption("--headful"),
64+
"chromiumSandbox": False,
65+
}
6366

6467

6568
@pytest.fixture(scope="session")
@@ -82,10 +85,6 @@ async def context(browser):
8285
context = await browser.newContext()
8386
yield context
8487
await context.close()
85-
if len(browser.contexts):
86-
for context in browser.contexts:
87-
await context.close()
88-
assert False
8988

9089

9190
@pytest.fixture

‎tests/test_browsercontext.py‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,10 @@ async def baseline():
208208
context = await browser.newContext()
209209
page = await context.newPage()
210210
await page.goto(server.PREFIX + "/csp.html")
211-
with pytest.raises(Error):
211+
try:
212212
await page.addScriptTag(content="window.__injected = 42;")
213+
except Error:
214+
pass
213215
assert await page.evaluate("window.__injected") is None
214216
await context.close()
215217

@@ -235,8 +237,10 @@ async def baseline():
235237
context = await browser.newContext()
236238
page = await context.newPage()
237239
await page.goto(server.EMPTY_PAGE)
238-
with pytest.raises(Error):
240+
try:
239241
await page.addScriptTag(content="window.__injected = 42;")
242+
except Error:
243+
pass
240244
assert await page.evaluate("() => window.__injected") is None
241245
await context.close()
242246

@@ -274,8 +278,10 @@ async def baseline():
274278
page = await context.newPage()
275279
await page.goto(server.EMPTY_PAGE)
276280
frame = await utils.attach_frame(page, "frame1", server.PREFIX + "/csp.html")
277-
with pytest.raises(Error):
281+
try:
278282
await frame.addScriptTag(content="window.__injected = 42;")
283+
except Error:
284+
pass
279285
assert await frame.evaluate("window.__injected") is None
280286
await context.close()
281287

@@ -287,7 +293,10 @@ async def override():
287293
page = await context.newPage()
288294
await page.goto(server.EMPTY_PAGE)
289295
frame = await utils.attach_frame(page, "frame1", server.PREFIX + "/csp.html")
290-
await frame.addScriptTag(content="window.__injected = 42;")
296+
try:
297+
await frame.addScriptTag(content="window.__injected = 42;")
298+
except Error:
299+
pass
291300
assert await frame.evaluate("window.__injected") == 42
292301
await context.close()
293302

0 commit comments

Comments
 (0)