Skip to content

Commit

Permalink
Testing pytest main branch
Browse files Browse the repository at this point in the history
  • Loading branch information
mrbean-bremen committed Mar 1, 2024
1 parent 18bd184 commit fa402bb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 14 deletions.
9 changes: 1 addition & 8 deletions .github/workflows/pythontests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
include:
- python-version: "pypy-3.7"
os: ubuntu-latest
- python-version: "pypy-3.9"
os: ubuntu-latest
- python-version: "pypy-3.10"
os: ubuntu-latest
python-version: [3.8, "3.11"]
env:
OS: ${{ matrix.os }}
steps:
Expand Down
5 changes: 3 additions & 2 deletions tests/test_xdist_handling.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@


def test_xdist_ordering(tmpdir):
print(f"{tmpdir=}")
testname = str(tmpdir.join("first_test.py"))
with open(testname, "w") as fi:
fi.write(
Expand Down Expand Up @@ -59,11 +60,11 @@ def test_first_string():
)
)
# With `loadfile`, the tests should pass
args = ["-n3", "--dist=loadfile", str(tmpdir)]
args = ["-n3", "-v", "--dist=loadfile", str(tmpdir)]
ret = pytest.main(args, [pytest_order])
assert ret == 0

# Without `loadfile`, the tests should fail
args = ["-n3", str(tmpdir)]
args = ["-n3", "-v", str(tmpdir)]
ret = pytest.main(args, [pytest_order])
assert ret == 1
6 changes: 2 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
[tox]
envlist =
{py37,pypy37}-pytest{50,54,60,62,624,70,74}
{py38,py39,pypy39}-pytest{50,54,60,62,624,70,74,80}
{py310,py311,py312,pypy310}-pytest{624,70,74,80}
{py38,py311}-pytest80
[testenv]
deps =
pytest50: pytest>=5.0,<5.1
Expand All @@ -12,7 +10,7 @@ deps =
pytest624: pytest>=6.2.4,<6.3
pytest70: pytest>=7.0,<7.1
pytest74: pytest>=7.3,<8.0
pytest80: pytest>=8.0,<9.0
pytest80: git+https://github.com/mrbean-bremen/pytest.git@short-paths
pytest-cov<2.10
pytest{50,54}: pytest-xdist<2.0.0
pytest{60,62,624,70,74,80}: pytest-xdist
Expand Down

0 comments on commit fa402bb

Please sign in to comment.