Skip to content

Commit 5644751

Browse files
author
Thiago Perrotta
committed
infra: run flake8 in webdriver/
Address flake8 findings in webdriver/ Rename duplicate test to test_params_pointer_action_move_coordinate_missing Bug: web-platform-tests/rfcs#171 Cmdline: flake8 --append-config=tools/flake8.ini webdriver/tests/bidi :
1 parent 6593bde commit 5644751

File tree

65 files changed

+639
-486
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+639
-486
lines changed

tools/tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ changedir =
1515

1616
commands =
1717
!flake8-!mypy: pytest --cov=tools --cov-report=term {posargs}
18-
flake8: flake8 --append-config={toxinidir}/flake8.ini {posargs}
18+
flake8: flake8 --append-config={toxinidir}/flake8.ini {toxinidir} {toxinidir}/../webdriver {posargs}
1919
mypy: mypy --config-file={toxinidir}/mypy.ini --explicit-package-bases tools
2020

2121
passenv =

webdriver/tests/bidi/browsing_context/capture_screenshot/clip.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
from . import (
77
get_element_coordinates,
8-
get_page_y_offset,
98
get_physical_element_dimensions,
109
get_reference_screenshot,
1110
)
@@ -176,7 +175,7 @@ async def test_clip_viewport_scroll_to(
176175

177176
element = await bidi_session.script.call_function(
178177
await_promise=False,
179-
function_declaration=f"""() => {{
178+
function_declaration="""() => {{
180179
const element = document.querySelector('div');
181180
182181
const rect = element.getBoundingClientRect();

webdriver/tests/bidi/browsing_context/context_destroyed/context_destroyed.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ async def on_event(_, data):
6363

6464
remove_listener = bidi_session.add_event_listener(CONTEXT_DESTROYED_EVENT, on_event)
6565

66-
url = inline(f"<div>test</div>", domain=domain)
66+
url = inline("<div>test</div>", domain=domain)
6767
await bidi_session.browsing_context.navigate(
6868
url=url, context=new_tab["context"], wait="complete"
6969
)

webdriver/tests/bidi/browsing_context/create/reference_context.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import pytest
22

33
from .. import assert_browsing_context
4-
from webdriver.bidi.modules.script import ContextTarget
54

65
pytestmark = pytest.mark.asyncio
76

webdriver/tests/bidi/browsing_context/fragment_navigated/fragment_navigated.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from webdriver.bidi.modules.script import ContextTarget
55
from webdriver.error import TimeoutException
66

7-
from ... import any_int, any_string, recursive_compare, int_interval
7+
from ... import any_int, recursive_compare, int_interval
88
from .. import assert_navigation_info
99

1010
pytestmark = pytest.mark.asyncio
@@ -90,7 +90,7 @@ async def test_navigation_id(
9090

9191
on_frame_navigated = wait_for_event(FRAGMENT_NAVIGATED_EVENT)
9292

93-
target_url = url(EMPTY_PAGE + '#foo');
93+
target_url = url(EMPTY_PAGE + '#foo')
9494
result = await bidi_session.browsing_context.navigate(
9595
context=new_tab["context"], url=target_url, wait="complete")
9696

@@ -113,7 +113,7 @@ async def test_url_with_base_tag(bidi_session, subscribe_events, inline, new_tab
113113

114114
on_frame_navigated = wait_for_event(FRAGMENT_NAVIGATED_EVENT)
115115

116-
target_url = url + '#foo';
116+
target_url = url + '#foo'
117117
await bidi_session.browsing_context.navigate(context=new_tab["context"], url=target_url, wait="complete")
118118

119119
recursive_compare(

webdriver/tests/bidi/browsing_context/navigate/data_url.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
pytestmark = pytest.mark.asyncio
88

99

10-
def dataURL(doc, mime_type="text/html", charset="utf-8", isBase64=False):
10+
def dataURL(doc, mime_type="text/html", charset="utf-8", is_base64=False):
1111
encoding = ""
1212
if charset:
1313
encoding = f"charset={charset}"
14-
elif isBase64:
14+
elif is_base64:
1515
encoding = "base64"
1616

1717
return f"data:{mime_type};{encoding},{quote(doc)}"

webdriver/tests/bidi/browsing_context/navigation_started/navigation_started.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
import pytest
32
from tests.support.sync import AsyncPoll
43

@@ -376,14 +375,14 @@ async def on_event(method, data):
376375
http_equiv_url = url(PAGE_REDIRECT_HTTP_EQUIV)
377376
redirected_url = url(PAGE_REDIRECTED_HTML)
378377

379-
result = await bidi_session.browsing_context.navigate(
378+
await bidi_session.browsing_context.navigate(
380379
context=top_context["context"],
381380
url=http_equiv_url,
382381
wait="complete",
383382
)
384383

385-
# Wait until we receive two events, one for the initial navigation and one for
386-
# the http-equiv "redirect".
384+
# Wait until we receive two events, one for the initial navigation and one
385+
# for the http-equiv "redirect".
387386
wait = AsyncPoll(bidi_session, timeout=2)
388387
await wait.until(lambda _: len(events) >= 2)
389388

@@ -403,6 +402,8 @@ async def on_event(method, data):
403402
},
404403
)
405404

405+
remove_listener()
406+
406407

407408
async def test_redirect_navigation(
408409
bidi_session, subscribe_events, top_context, url
@@ -424,7 +425,7 @@ async def on_event(method, data):
424425
f"/webdriver/tests/support/http_handlers/redirect.py?location={html_url}"
425426
)
426427

427-
result = await bidi_session.browsing_context.navigate(
428+
await bidi_session.browsing_context.navigate(
428429
context=top_context["context"],
429430
url=redirect_url,
430431
wait="complete",
@@ -439,6 +440,8 @@ async def on_event(method, data):
439440
},
440441
)
441442

443+
remove_listener()
444+
442445

443446
async def test_navigate_history_pushstate(
444447
bidi_session, inline, new_tab, subscribe_events, wait_for_event

webdriver/tests/bidi/browsing_context/print/margin.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ async def test_margin_minimum_page_size(
173173

174174
# Check that margins don't affect page dimensions and equal defaults.
175175
await assert_pdf_dimensions(value, {
176-
"width": expected_width,
177-
"height": expected_height,
176+
"width": expected_width,
177+
"height": expected_height,
178178
})
179179

180180

webdriver/tests/bidi/browsing_context/set_viewport/set_viewport.py

+9-6
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,16 @@ async def test_set_viewport_reset(bidi_session, new_tab):
4444
assert await get_viewport_dimensions(bidi_session, new_tab) != test_viewport
4545

4646
await bidi_session.browsing_context.set_viewport(
47-
context=new_tab["context"],
48-
viewport=test_viewport)
47+
context=new_tab["context"],
48+
viewport=test_viewport
49+
)
4950

5051
assert await get_viewport_dimensions(bidi_session, new_tab) == test_viewport
5152

5253
await bidi_session.browsing_context.set_viewport(
53-
context=new_tab["context"],
54-
viewport=None)
54+
context=new_tab["context"],
55+
viewport=None
56+
)
5557
assert await get_viewport_dimensions(bidi_session, new_tab) == original_viewport
5658

5759

@@ -64,8 +66,9 @@ async def test_set_viewport_affects_specific_context(bidi_session, top_context,
6466
assert await get_viewport_dimensions(bidi_session, new_tab) != test_viewport
6567

6668
await bidi_session.browsing_context.set_viewport(
67-
context=new_tab["context"],
68-
viewport=test_viewport)
69+
context=new_tab["context"],
70+
viewport=test_viewport
71+
)
6972

7073
assert await get_viewport_dimensions(bidi_session, new_tab) == test_viewport
7174
assert await get_viewport_dimensions(bidi_session, top_context) == original_viewport

webdriver/tests/bidi/browsing_context/user_prompt_closed/user_prompt_closed.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ async def on_event(method, data):
188188
# Open a prompt in the different context.
189189
await bidi_session.browsing_context.navigate(
190190
context=another_new_context["context"],
191-
url=inline(f"<script>window.alert('second tab')</script>"),
191+
url=inline("<script>window.alert('second tab')</script>"),
192192
)
193193

194194
await on_prompt_opened
@@ -208,7 +208,7 @@ async def on_event(method, data):
208208
# Open a prompt in the subscribed context.
209209
await bidi_session.browsing_context.navigate(
210210
context=new_context["context"],
211-
url=inline(f"<script>window.alert('first tab')</script>"),
211+
url=inline("<script>window.alert('first tab')</script>"),
212212
)
213213

214214
await on_prompt_opened

webdriver/tests/bidi/input/perform_actions/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,4 @@ async def record_pointer_events(bidi_session, context, container, selector):
133133
await_promise=False,
134134
)
135135

136-
return target
136+
return target

0 commit comments

Comments
 (0)