From f5beafc38c57c30f0b1cd6da97acf4088ee94f41 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Wed, 30 Nov 2022 14:27:10 +0100 Subject: [PATCH] Fix tests --- .github/workflows/main.yaml | 1 - tests/test_integration.py | 4 ++-- tox.ini | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index b64fd1b..65b2455 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -24,7 +24,6 @@ jobs: # Generate it by: tox -l | sed "s/^/- /" - py36-tox324 - py36-tox3 - - py36-tox4 - py37-tox324 - py37-tox3 - py37-tox4 diff --git a/tests/test_integration.py b/tests/test_integration.py index 02e576b..8eb13b1 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -240,7 +240,7 @@ def test_print_extras_to_file(toxenv, tmp_path): def test_allenvs_print_deps_to_file(tmp_path, option): depspath = tmp_path / "deps" result = tox(option, str(depspath)) - assert depspath.read_text().splitlines() == ["six", "py"] * 5 + assert depspath.read_text().splitlines() == ["six", "py"] * len(envs_from_tox_ini()) expected = textwrap.dedent( f""" {tox_footer()} @@ -253,7 +253,7 @@ def test_allenvs_print_deps_to_file(tmp_path, option): def test_allenvs_print_extras_to_file(tmp_path, option): extraspath = tmp_path / "extras" result = tox(option, str(extraspath)) - assert extraspath.read_text().splitlines() == ["dev", "full"] * 5 + assert extraspath.read_text().splitlines() == ["dev", "full"] * len(envs_from_tox_ini()) expected = textwrap.dedent( f""" {tox_footer()} diff --git a/tox.ini b/tox.ini index f0a7167..ceadfcb 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ # This information is repeated in .github/workflows/main.yaml # (see https://github.com/fedora-python/tox-github-action/issues/8) -envlist = {py36,py37,py38,py39,py310,py311}-tox{324,3,4} +envlist = py36-tox{324,3},{py37,py38,py39,py310,py311}-tox{324,3,4} [testenv] extras =