Skip to content

Commit 26f9aa2

Browse files
[py] moved all pytest configuration settings from pytest.ini file to pyproject.toml (#14256)
--------- Co-authored-by: Diego Molina <[email protected]>
1 parent e4258ea commit 26f9aa2

File tree

3 files changed

+19
-16
lines changed

3 files changed

+19
-16
lines changed

py/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ py_library(
335335
"test/selenium/webdriver/support/conftest.py",
336336
],
337337
data = [
338-
"pytest.ini",
338+
"pyproject.toml",
339339
"setup.cfg",
340340
"test/selenium/webdriver/common/test_file.txt",
341341
"test/selenium/webdriver/common/test_file2.txt",

py/pyproject.toml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
11
[build-system]
22
requires = ["setuptools", "setuptools-rust"]
33
build-backend = "setuptools.build_meta"
4+
5+
[tool.pytest.ini_options]
6+
console_output_style = "progress"
7+
faulthandler_timeout = 60
8+
log_cli = true
9+
trio_mode = true
10+
markers = [
11+
"xfail_chrome: Tests expected to fail in Chrome",
12+
"xfail_edge: Tests expected to fail in Edge",
13+
"xfail_firefox: Tests expected to fail in Firefox",
14+
"xfail_ie: Tests expected to fail in IE",
15+
"xfail_remote: Tests expected to fail with Remote webdriver",
16+
"xfail_safari: Tests expected to fail in Safari",
17+
"xfail_webkitgtk: Tests expected to fail in webkitgtk",
18+
"no_driver_after_test: If there are no drivers after the test it will create a new one."
19+
]
20+
python_files = ["test_*.py", "*_test.py"]
21+
testpaths = ["test"]

py/pytest.ini

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)