From 16f8b5074246aa58305b219247650f29210d579d Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 2 Mar 2025 07:55:46 +0800 Subject: [PATCH] python3Packages.pytestCheckHook: support deselecting tests via disabledTestPaths Pass disabledTestPaths elements containing double colons (::) to --deselect instead of --ignore-glob. --- pkgs/development/interpreters/python/hooks/default.nix | 6 ++++++ .../interpreters/python/hooks/pytest-check-hook.sh | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index d8b8f661ee2a..8d6c26e7b7f7 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -184,6 +184,12 @@ in ] ++ previousPythonAttrs.disabledTestPaths or [ ]; }) ); + disabledTestPaths-item = objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-disabledTestPaths-item-${previousPythonAttrs.pname}"; + disabledTestPaths = [ + "tests/test_basic.py::TestBasic" + ] ++ previousPythonAttrs.disabledTestPaths or [ ]; + }); disabledTestPaths-glob = objprint.overridePythonAttrs (previousPythonAttrs: { pname = "test-pytestCheckHook-disabledTestPaths-glob-${previousPythonAttrs.pname}"; disabledTestPaths = [ diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh index 1696b180b3f6..50757ec5b7ae 100644 --- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh @@ -13,8 +13,11 @@ function pytestCheckPhase() { local -a _pathsArray=() concatTo _pathsArray disabledTestPaths for path in "${_pathsArray[@]}"; do - # Check if every path glob matches at least one path - @pythonCheckInterpreter@ - "$path" <