Skip to content

Commit 277ad7c

Browse files
committed
Allow the use of "conftest.py" for configuring pytest
1 parent 8b3d697 commit 277ad7c

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

examples/pytest.ini

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

3-
# Let console output be seen. Don't override the pytest plugin.
4-
addopts = --capture=no --ignore conftest.py -p no:cacheprovider
3+
# Display console output and disable the cacheprovider.
4+
addopts = --capture=no -p no:cacheprovider
55

66
# Ignore warnings such as DeprecationWarning and PytestUnknownMarkWarning
77
filterwarnings =

examples/translations/pytest.ini

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

3-
# Let console output be seen. Don't override the pytest plugin.
4-
addopts = --capture=no --ignore conftest.py -p no:cacheprovider
3+
# Display console output and disable the cacheprovider.
4+
addopts = --capture=no -p no:cacheprovider
55

66
# Ignore warnings such as DeprecationWarning and PytestUnknownMarkWarning
77
filterwarnings =

pytest.ini

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

3-
# Let console output be seen. Don't override the pytest plugin.
4-
addopts = --capture=no --ignore conftest.py -p no:cacheprovider
3+
# Display console output and disable the cacheprovider.
4+
addopts = --capture=no -p no:cacheprovider
55

66
# Ignore warnings such as DeprecationWarning and PytestUnknownMarkWarning
77
filterwarnings =

seleniumbase/console_scripts/sb_mkdir.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ def main():
123123

124124
data = []
125125
data.append("[pytest]")
126-
data.append("addopts = --capture=no --ignore conftest.py "
127-
"-p no:cacheprovider")
126+
data.append("addopts = --capture=no -p no:cacheprovider")
128127
data.append("filterwarnings =")
129128
data.append(" ignore::pytest.PytestWarning")
130129
data.append(" ignore:.*U.*mode is deprecated:DeprecationWarning")

0 commit comments

Comments
 (0)