Skip to content

Commit 8209647

Browse files
authored
Remove unintentionally-unconditional skips (#13842)
1 parent d5a0057 commit 8209647

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

CONTRIBUTING.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ Short version
203203

204204
#. Write a ``changelog`` entry: ``changelog/2574.bugfix.rst``, use issue id number
205205
and one of ``feature``, ``improvement``, ``bugfix``, ``doc``, ``deprecation``,
206-
``breaking``, ``vendor`` or ``trivial`` for the issue type.
206+
``breaking``, ``vendor``, ``packaging``, ``contrib``, or ``misc`` for the issue type.
207207

208208

209209
#. Unless your change is a trivial or a documentation fix (e.g., a typo or reword of a small section) please
@@ -305,8 +305,9 @@ Here is a simple overview, with pytest-specific bits:
305305

306306
#. Create a new changelog entry in ``changelog``. The file should be named ``<issueid>.<type>.rst``,
307307
where *issueid* is the number of the issue related to the change and *type* is one of
308-
``feature``, ``improvement``, ``bugfix``, ``doc``, ``deprecation``, ``breaking``, ``vendor``
309-
or ``trivial``. You may skip creating the changelog entry if the change doesn't affect the
308+
``feature``, ``improvement``, ``bugfix``, ``doc``, ``deprecation``, ``breaking``, ``vendor``,
309+
``packaging``, ``contrib``, or ``misc``.
310+
You may skip creating the changelog entry if the change doesn't affect the
310311
documented behaviour of pytest.
311312

312313
#. Add yourself to ``AUTHORS`` file if not there yet, in alphabetical order.

testing/_py/test_local.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -207,13 +207,9 @@ def test_visit_norecurse(self, path1):
207207
assert "sampledir" in lst
208208
assert path1.sep.join(["sampledir", "otherfile"]) not in lst
209209

210-
@pytest.mark.parametrize(
211-
"fil",
212-
["*dir", pytest.mark.skip("sys.version_info < (3,6)")(b"*dir")],
213-
)
214-
def test_visit_filterfunc_is_string(self, path1, fil):
210+
def test_visit_filterfunc_is_string(self, path1):
215211
lst = []
216-
for i in path1.visit(fil):
212+
for i in path1.visit("*dir"):
217213
lst.append(i.relto(path1))
218214
assert len(lst), 2 # noqa: PLC1802,RUF040
219215
assert "sampledir" in lst
@@ -463,12 +459,11 @@ def test_fspath_func_match_strpath(self, path1):
463459

464460
assert fspath(path1) == path1.strpath
465461

466-
@pytest.mark.skip("sys.version_info < (3,6)")
467462
def test_fspath_open(self, path1):
468-
f = path1.join("opentestfile")
469-
open(f)
463+
f = path1.join("samplefile")
464+
stream = open(f, encoding="utf-8")
465+
stream.close()
470466

471-
@pytest.mark.skip("sys.version_info < (3,6)")
472467
def test_fspath_fsencode(self, path1):
473468
from os import fsencode
474469

0 commit comments

Comments
 (0)