Skip to content

Commit 169f9a6

Browse files
jakob-bagterpjakob-bagterp
authored
Merge pull request #1018 from jakob-bagterp/fix/various-impediments-and-failed-tests-in-github-actions
Fix: Various impediments and failing tests in GitHub Actions
2 parents b6573e0 + 3f01b72 commit 169f9a6

28 files changed

Lines changed: 90 additions & 42 deletions

‎.github/workflows/codecov.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Generate coverage report
3131
# The list of "--ignore=..." arguments should be identical to the exclusion list in tox.ini, though without comments:
3232
run: >
33-
uv run pytest --numprocesses=3 --cov=./ --cov-report=xml -vv -rA
33+
uv run pytest --timeout=120 --numprocesses=3 --cov=./ --cov-report=xml -vv -rA
3434
--ignore=test/browser/input/select_1_test.py
3535
--ignore=test/browser/input/select_headless_exception_test.py
3636
--ignore=test/browser/viewport/get/height_non_headless_1_test.py

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ jobs:
3939
4040
- name: Run tests with Tox
4141
env:
42-
PYTEST_XDIST_WORKERS: ${{ matrix.os == 'windows-latest' && 0 || 3 }}
42+
PYTEST_XDIST_WORKERS: ${{ (matrix.os == 'windows-latest' || matrix.os == 'macos-latest') && '0' || '3' }}
4343
run: tox
44-
timeout-minutes: 60
44+
timeout-minutes: 120

‎pyproject.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ dev = [
4646
"pre-commit==4.5.1",
4747
"pytest==9.1.1",
4848
"pytest-cov==7.1.0",
49+
"pytest-timeout==2.4.0",
4950
"pytest-xdist==3.8.0",
5051
"ruff==0.15.20",
5152
"tox==4.58.0",

‎test/_mock_data/url/internal_url.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,14 @@
7070

7171
SCROLL_CANVAS: str = update_path_format_if_windows(f"file://{_web_mock_data_directory}/scroll/canvas/page.html")
7272

73-
SCROLL_LONG_VERTICAL: str = update_path_format_if_windows(
74-
f"file://{_web_mock_data_directory}/scroll/long_vertical/page.html"
73+
SCROLL_VERTICAL_MEDIUM: str = update_path_format_if_windows(
74+
f"file://{_web_mock_data_directory}/scroll/vertical_medium/page.html"
7575
)
7676

77-
SCROLL_WIDE_HORIZONTAL: str = update_path_format_if_windows(
78-
f"file://{_web_mock_data_directory}/scroll/wide_horizontal/page.html"
77+
SCROLL_VERTICAL_LONG: str = update_path_format_if_windows(
78+
f"file://{_web_mock_data_directory}/scroll/vertical_long/page.html"
79+
)
80+
81+
SCROLL_HORIZONTAL_WIDE: str = update_path_format_if_windows(
82+
f"file://{_web_mock_data_directory}/scroll/horizontal_wide/page.html"
7983
)

test/_mock_data/web/scroll/wide_horizontal/page.html renamed to test/_mock_data/web/scroll/horizontal_wide/page.html

File renamed without changes.

test/_mock_data/web/scroll/wide_horizontal/styles.css renamed to test/_mock_data/web/scroll/horizontal_wide/styles.css

File renamed without changes.

test/_mock_data/web/scroll/long_vertical/page.html renamed to test/_mock_data/web/scroll/vertical_long/page.html

File renamed without changes.

test/_mock_data/web/scroll/long_vertical/styles.css renamed to test/_mock_data/web/scroll/vertical_long/styles.css

File renamed without changes.

‎test/_mock_data/web/scroll/vertical_medium/page.html‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<!DOCTYPE html>
2+
<html lang="en"><head>
3+
<meta charset="UTF-8">
4+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
5+
<link rel="stylesheet" type="text/css" href="./styles.css">
6+
<title>Long Scrolling Page</title>
7+
</head>
8+
<body>
9+
<h1>Welcome to the Long Scrolling Page</h1>
10+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed id venenatis dolor. Nam posuere semper lacinia. Nam feugiat sapien sed mollis egestas. Proin sed nibh nunc. Nam eget sem in libero consequat sodales. Donec rutrum volutpat eros sed aliquet. Quisque mollis mauris aliquam diam feugiat pharetra. Phasellus tristique arcu non felis egestas vulputate. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut id dui tincidunt, imperdiet mi a, sodales mi.</p>
11+
<p>Praesent dictum condimentum justo. Sed in nulla et justo fermentum semper. Mauris vulputate dictum bibendum. Curabitur at tincidunt enim, nec luctus ex. Mauris ac porttitor ligula, ac lobortis felis. Nunc sed lacinia libero. Donec condimentum mattis diam, nec sagittis nisl lacinia eget. Aenean eros ex, vestibulum vel turpis id, imperdiet faucibus risus. Curabitur maximus sagittis dignissim.</p>
12+
<p>In hac habitasse platea dictumst. Quisque porta felis eu tortor semper pulvinar. Donec venenatis hendrerit enim et tristique. Integer placerat venenatis ipsum, eu tempor libero lacinia tincidunt. Pellentesque vitae odio euismod, lobortis lacus feugiat, suscipit tortor. Phasellus a ante molestie, consequat enim non, mollis enim. Nullam sagittis vel neque sit amet imperdiet. Etiam id massa ornare diam auctor malesuada eget ac odio. In pulvinar neque arcu. Etiam quis enim quis leo ornare viverra vitae ut odio. Nunc vehicula eget tortor imperdiet commodo. Aenean elementum lacus ac elit molestie bibendum. Aenean et leo eu tellus consectetur sollicitudin. Sed eu tincidunt urna. Nulla scelerisque convallis erat.</p>
13+
<p>In hac habitasse platea dictumst. Praesent nisl massa, elementum sed fringilla sit amet, vehicula eget augue. Curabitur non maximus ante. Nullam quis urna sed velit cursus fermentum quis a nisi. Quisque nec posuere velit, quis pellentesque metus. Pellentesque rhoncus gravida turpis, a pharetra dui bibendum quis. Morbi auctor dapibus ipsum sit amet cursus.</p>
14+
<p>Phasellus eros lorem, faucibus quis pretium eu, rhoncus non augue. Curabitur non velit libero. Nam nec nulla nunc. Integer eu tempor quam, et placerat turpis. Maecenas aliquam, quam in sodales suscipit, justo libero auctor ante, et interdum dui mauris dapibus libero. In quis ligula tempor, mollis mauris vel, euismod purus. Nam aliquet est at erat finibus mollis. Pellentesque eleifend lacus sed dapibus dapibus. Praesent tristique magna non tortor dapibus varius. Ut cursus efficitur leo vel commodo.</p>
15+
<p>Vestibulum elementum lobortis ex, eu commodo nulla euismod eget. Nullam convallis quam erat, sed venenatis tellus tincidunt at. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus pulvinar porttitor orci id varius. Cras interdum vehicula varius. Aenean non magna diam. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Cras fermentum, nisl sit amet placerat fermentum, lacus urna congue risus, id vulputate mauris dui ac lectus. Suspendisse commodo orci id venenatis dignissim. Praesent id facilisis nisl. Integer congue, mi a interdum consequat, orci libero malesuada nunc, et dapibus nisi lorem non arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Morbi tristique, massa in ornare pellentesque, nibh risus gravida urna, vel mattis orci massa non augue.</p>
16+
<p>Nulla facilisi. Nullam nec dolor gravida, luctus sapien nec, rutrum tellus. Morbi hendrerit ultrices aliquam. Nulla et finibus magna, in egestas nunc. Vivamus non auctor enim. Curabitur gravida ullamcorper urna, id pulvinar orci. Praesent id velit vel nisi vulputate consectetur vitae vel eros. Vestibulum consectetur tortor non justo pulvinar, sed auctor augue tincidunt. Sed nec auctor massa. Sed pulvinar rhoncus orci sit amet pretium. Sed placerat mattis felis, non dictum metus vulputate eget. Vestibulum eget augue mi.</p>
17+
<p>The end.</p>
18+
</body></html>

‎test/_mock_data/web/scroll/vertical_medium/styles.css‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
h1 {
2+
font-size: 6rem;
3+
padding-bottom: 4rem;
4+
}
5+
6+
p {
7+
font-size: 3rem;
8+
padding-bottom: 4rem;
9+
}

0 commit comments

Comments
 (0)