Skip to content

Commit 402a86d

Browse files
committed
Refactor pytest.ini
1 parent 4714412 commit 402a86d

File tree

6 files changed

+47
-54
lines changed

6 files changed

+47
-54
lines changed

examples/master_qa/pytest.ini

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[pytest]
22

3-
# Display console output, disable cacheprovider, don't collect recordings:
4-
addopts = --capture=no -p no:cacheprovider --ignore=recordings
3+
# Display console output. Disable cacheprovider:
4+
addopts = --capture=no -p no:cacheprovider
55

6-
# Skip looking in these directories for tests:
7-
norecursedirs = .* build dist recordings temp
6+
# Skip these directories during test collection:
7+
norecursedirs = .* build dist recordings temp assets
88

9-
# Ignore warnings such as DeprecationWarning and PytestUnknownMarkWarning
9+
# Ignore DeprecationWarning, PytestUnknownMarkWarning
1010
filterwarnings =
1111
ignore::pytest.PytestWarning
1212
ignore:.*U.*mode is deprecated:DeprecationWarning
@@ -16,15 +16,14 @@ junit_family = legacy
1616

1717
# Set pytest discovery rules:
1818
# (Most of the rules here are similar to the default rules.)
19-
# (unittest.TestCase rules override the rules here for classes and functions.)
19+
# (Inheriting unittest.TestCase could override these rules.)
2020
python_files = test_*.py *_test.py *_tests.py *_suite.py *_test_*.py
2121
python_classes = Test* *Test* *Test *Tests *Suite
2222
python_functions = test_*
2323

24-
# Here are some common pytest markers:
25-
# (Some are used in the example tests.)
26-
# (pytest v4.5.0 and newer requires marker registration to prevent warnings.)
27-
# (Future versions of pytest may turn those marker warnings into errors.)
24+
# Common pytest markers used in examples:
25+
# (pytest may require marker registration to prevent warnings.)
26+
# (Future versions may turn those marker warnings into errors.)
2827
markers =
2928
marker1: custom marker
3029
marker2: custom marker

examples/migration/raw_selenium/pytest.ini

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[pytest]
22

3-
# Display console output, disable cacheprovider, don't collect recordings:
4-
addopts = --capture=no -p no:cacheprovider --ignore=recordings
3+
# Display console output. Disable cacheprovider:
4+
addopts = --capture=no -p no:cacheprovider
55

6-
# Skip looking in these directories for tests:
7-
norecursedirs = .* build dist recordings temp
6+
# Skip these directories during test collection:
7+
norecursedirs = .* build dist recordings temp assets
88

9-
# Ignore warnings such as DeprecationWarning and PytestUnknownMarkWarning
9+
# Ignore DeprecationWarning, PytestUnknownMarkWarning
1010
filterwarnings =
1111
ignore::pytest.PytestWarning
1212
ignore:.*U.*mode is deprecated:DeprecationWarning
@@ -16,15 +16,14 @@ junit_family = legacy
1616

1717
# Set pytest discovery rules:
1818
# (Most of the rules here are similar to the default rules.)
19-
# (unittest.TestCase rules override the rules here for classes and functions.)
19+
# (Inheriting unittest.TestCase could override these rules.)
2020
python_files = *.py
2121
python_classes = Test* *Test* *Test *Tests *Suite
2222
python_functions = test_*
2323

24-
# Here are some common pytest markers:
25-
# (Some are used in the example tests.)
26-
# (pytest v4.5.0 and newer requires marker registration to prevent warnings.)
27-
# (Future versions of pytest may turn those marker warnings into errors.)
24+
# Common pytest markers used in examples:
25+
# (pytest may require marker registration to prevent warnings.)
26+
# (Future versions may turn those marker warnings into errors.)
2827
markers =
2928
marker1: custom marker
3029
marker2: custom marker

examples/pytest.ini

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[pytest]
22

3-
# Display console output, disable cacheprovider, don't collect recordings:
4-
addopts = --capture=no -p no:cacheprovider --ignore=recordings
3+
# Display console output. Disable cacheprovider:
4+
addopts = --capture=no -p no:cacheprovider
55

6-
# Skip looking in these directories for tests:
7-
norecursedirs = .* build dist recordings temp
6+
# Skip these directories during test collection:
7+
norecursedirs = .* build dist recordings temp assets
88

9-
# Ignore warnings such as DeprecationWarning and PytestUnknownMarkWarning
9+
# Ignore DeprecationWarning, PytestUnknownMarkWarning
1010
filterwarnings =
1111
ignore::pytest.PytestWarning
1212
ignore:.*U.*mode is deprecated:DeprecationWarning
@@ -16,15 +16,14 @@ junit_family = legacy
1616

1717
# Set pytest discovery rules:
1818
# (Most of the rules here are similar to the default rules.)
19-
# (unittest.TestCase rules override the rules here for classes and functions.)
19+
# (Inheriting unittest.TestCase could override these rules.)
2020
python_files = test_*.py *_test.py *_tests.py *_suite.py
2121
python_classes = Test* *Test* *Test *Tests *Suite
2222
python_functions = test_*
2323

24-
# Here are some common pytest markers:
25-
# (Some are used in the example tests.)
26-
# (pytest v4.5.0 and newer requires marker registration to prevent warnings.)
27-
# (Future versions of pytest may turn those marker warnings into errors.)
24+
# Common pytest markers used in examples:
25+
# (pytest may require marker registration to prevent warnings.)
26+
# (Future versions may turn those marker warnings into errors.)
2827
markers =
2928
marker1: custom marker
3029
marker2: custom marker

examples/translations/pytest.ini

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[pytest]
22

3-
# Display console output, disable cacheprovider, don't collect recordings:
4-
addopts = --capture=no -p no:cacheprovider --ignore=recordings
3+
# Display console output. Disable cacheprovider:
4+
addopts = --capture=no -p no:cacheprovider
55

6-
# Skip looking in these directories for tests:
7-
norecursedirs = .* build dist recordings temp
6+
# Skip these directories during test collection:
7+
norecursedirs = .* build dist recordings temp assets
88

9-
# Ignore warnings such as DeprecationWarning and PytestUnknownMarkWarning
9+
# Ignore DeprecationWarning, PytestUnknownMarkWarning
1010
filterwarnings =
1111
ignore::pytest.PytestWarning
1212
ignore:.*U.*mode is deprecated:DeprecationWarning
@@ -16,15 +16,14 @@ junit_family = legacy
1616

1717
# Set pytest discovery rules:
1818
# (Most of the rules here are similar to the default rules.)
19-
# (unittest.TestCase rules override the rules here for classes and functions.)
19+
# (Inheriting unittest.TestCase could override these rules.)
2020
python_files = test_*.py *_test.py *_tests.py *_suite.py *_test_*.py
2121
python_classes = Test* *Test* *Test *Tests *Suite
2222
python_functions = test_*
2323

24-
# Here are some common pytest markers:
25-
# (Some are used in the example tests.)
26-
# (pytest v4.5.0 and newer requires marker registration to prevent warnings.)
27-
# (Future versions of pytest may turn those marker warnings into errors.)
24+
# Common pytest markers used in examples:
25+
# (pytest may require marker registration to prevent warnings.)
26+
# (Future versions may turn those marker warnings into errors.)
2827
markers =
2928
marker1: custom marker
3029
marker2: custom marker

pytest.ini

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[pytest]
22

3-
# Display console output, disable cacheprovider, don't collect recordings:
4-
addopts = --capture=no -p no:cacheprovider --ignore=recordings
3+
# Display console output. Disable cacheprovider:
4+
addopts = --capture=no -p no:cacheprovider
55

6-
# Skip looking in these directories for tests:
7-
norecursedirs = .* build dist recordings temp
6+
# Skip these directories during test collection:
7+
norecursedirs = .* build dist recordings temp assets
88

9-
# Ignore warnings such as DeprecationWarning and PytestUnknownMarkWarning
9+
# Ignore DeprecationWarning, PytestUnknownMarkWarning
1010
filterwarnings =
1111
ignore::pytest.PytestWarning
1212
ignore:.*U.*mode is deprecated:DeprecationWarning
@@ -16,15 +16,14 @@ junit_family = legacy
1616

1717
# Set pytest discovery rules:
1818
# (Most of the rules here are similar to the default rules.)
19-
# (unittest.TestCase rules override the rules here for classes and functions.)
19+
# (Inheriting unittest.TestCase could override these rules.)
2020
python_files = test_*.py *_test.py *_tests.py *_suite.py
2121
python_classes = Test* *Test* *Test *Tests *Suite
2222
python_functions = test_*
2323

24-
# Here are some common pytest markers:
25-
# (Some are used in the example tests.)
26-
# (pytest v4.5.0 and newer requires marker registration to prevent warnings.)
27-
# (Future versions of pytest may turn those marker warnings into errors.)
24+
# Common pytest markers used in examples:
25+
# (pytest may require marker registration to prevent warnings.)
26+
# (Future versions may turn those marker warnings into errors.)
2827
markers =
2928
marker1: custom marker
3029
marker2: custom marker

seleniumbase/console_scripts/sb_mkdir.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,8 @@ def main():
121121

122122
data = []
123123
data.append("[pytest]")
124-
data.append(
125-
"addopts = --capture=no -p no:cacheprovider --ignore=recordings"
126-
)
127-
data.append("norecursedirs = .* build dist recordings temp")
124+
data.append("addopts = --capture=no -p no:cacheprovider")
125+
data.append("norecursedirs = .* build dist recordings temp assets")
128126
data.append("filterwarnings =")
129127
data.append(" ignore::pytest.PytestWarning")
130128
data.append(" ignore:.*U.*mode is deprecated:DeprecationWarning")

0 commit comments

Comments
 (0)