floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix rebase artefacts

This commit is contained in:
Ronny Pfannschmidt 2022-07-12 10:24:28 +02:00
parent 3e01de512a
commit 4ac06da2f4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/_pytest/config/findpaths.py
View File

@ -1,6 +1,5 @@
import os import os
import sys import sys
import warnings
from pathlib import Path from pathlib import Path
from typing import Dict from typing import Dict
from typing import Iterable from typing import Iterable
@ -81,7 +80,7 @@ def _parse_cfg_file(path: Path) -> PARSE_RESULT:
def _parse_pyproject_ini_options( def _parse_pyproject_ini_options(
path: Path, filepath: Path,
) -> PARSE_RESULT: ) -> PARSE_RESULT:
"""Load backward compatible ini options from pyproject.toml""" """Load backward compatible ini options from pyproject.toml"""

2
testing/test_config.py
View File

@ -113,7 +113,7 @@ class TestParseIni:
@pytest.mark.parametrize( @pytest.mark.parametrize(
"section, name", "section, name",
[ [
pytest.param("tool:pytest", "setup.cfg", marks=setup_cfg_nowarn), pytest.param("tool:pytest", "setup.cfg"),
("pytest", "tox.ini"), ("pytest", "tox.ini"),
("pytest", "pytest.ini"), ("pytest", "pytest.ini"),
("pytest", ".pytest.ini"), ("pytest", ".pytest.ini"),