From 0b35756c720b510c2d5bb70f98fc4a2eb1cb47dd Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sat, 15 Apr 2023 14:59:14 +0100 Subject: [PATCH] Split isort and flake8 tests --- requirements.txt | 1 - tests/test_cookiecutter_generation.py | 12 ++++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cc729cf64..7ee3bbdea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,6 @@ binaryornot==0.4.4 black==23.3.0 isort==5.12.0 flake8==6.0.0 -flake8-isort==6.0.0 pre-commit==3.2.2 # Testing diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 3dea23f94..9837be3ef 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -204,6 +204,18 @@ def test_black_passes(cookies, context_override): pytest.fail(e.stdout.decode()) +@pytest.mark.skipif(not AUTOFIXABLE_STYLES, reason="isort is auto-fixable") +@pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id) +def test_isort_passes(cookies, context_override): + """Check whether generated project passes isort style.""" + result = cookies.bake(extra_context=context_override) + + try: + sh.isort(_cwd=str(result.project_path)) + except sh.ErrorReturnCode as e: + pytest.fail(e.stdout.decode()) + + @pytest.mark.parametrize( ["use_docker", "expected_test_script"], [