diff --git a/pkgs/clan-app/default.nix b/pkgs/clan-app/default.nix index ba25a00f2..a3a3499c3 100644 --- a/pkgs/clan-app/default.nix +++ b/pkgs/clan-app/default.nix @@ -53,7 +53,6 @@ let [ # Testing framework ps.pytest - ps.pytest-cov # Generate coverage reports ps.pytest-subprocess # fake the real subprocess behavior to make your tests more independent. ps.pytest-xdist # Run tests in parallel on multiple cores ps.pytest-timeout # Add timeouts to your tests diff --git a/pkgs/clan-app/pyproject.toml b/pkgs/clan-app/pyproject.toml index 16191469e..60083f92a 100644 --- a/pkgs/clan-app/pyproject.toml +++ b/pkgs/clan-app/pyproject.toml @@ -25,7 +25,7 @@ testpaths = "tests" faulthandler_timeout = 60 log_level = "DEBUG" log_format = "%(levelname)s: %(message)s\n %(pathname)s:%(lineno)d::%(funcName)s" -addopts = "--cov . --cov-report term --cov-report html:.reports/html --no-cov-on-fail --durations 5 --color=yes --new-first" # Add --pdb for debugging +addopts = "--durations 5 --color=yes --new-first" # Add --pdb for debugging norecursedirs = "tests/helpers" markers = ["impure"] diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix index 23d501b16..d35dd7a6c 100644 --- a/pkgs/clan-cli/default.nix +++ b/pkgs/clan-cli/default.nix @@ -28,7 +28,6 @@ let ps: [ ps.pytest - ps.pytest-cov ps.pytest-subprocess ps.pytest-xdist ps.pytest-timeout diff --git a/pkgs/clan-cli/pyproject.toml b/pkgs/clan-cli/pyproject.toml index a56a0c3e2..308a98042 100644 --- a/pkgs/clan-cli/pyproject.toml +++ b/pkgs/clan-cli/pyproject.toml @@ -36,7 +36,7 @@ testpaths = ["tests", "clan_cli", "clan_lib"] faulthandler_timeout = 240 log_level = "DEBUG" log_format = "%(message)s" -addopts = "--cov . --cov-report term --cov-report html:.reports/html --no-cov-on-fail --durations 5 --color=yes --new-first -W error -n auto" # Add --pdb for debugging +addopts = "--durations 5 --color=yes --new-first -W error -n auto" # Add --pdb for debugging norecursedirs = ["clan_cli/tests/helpers", "clan_lib/nixpkgs"] # All tests which evaluate any nix library code from clan-core need to use the # `with_core` marker, so basically all tests which evaluate a flake with @@ -47,12 +47,6 @@ markers = ["impure", "with_core"] filterwarnings = "default::ResourceWarning" python_files = ["test_*.py", "*_test.py"] -# TODO: cov seems to conflict with xdist -# [tool.coverage.run] -# branch = true -# source = ["clan_lib"] -# omit = ["*/tests/*", "*/test_*.py", "*/*_test.py", "*/conftest.py", "docs.py"] - [tool.mypy] python_version = "3.12" warn_redundant_casts = true diff --git a/pkgs/clan-vm-manager/default.nix b/pkgs/clan-vm-manager/default.nix index 9c0822ad1..7a6db5b3f 100644 --- a/pkgs/clan-vm-manager/default.nix +++ b/pkgs/clan-vm-manager/default.nix @@ -10,7 +10,6 @@ pygobject-stubs, pygobject3, pytest, # Testing framework - pytest-cov, # Generate coverage reports pytest-subprocess, # fake the real subprocess behavior to make your tests more independent. pytest-timeout, # Add timeouts to your tests pytest-xdist, # Run tests in parallel on multiple cores @@ -62,7 +61,6 @@ let ++ runtimeDependencies ++ [ pytest # Testing framework - pytest-cov # Generate coverage reports pytest-subprocess # fake the real subprocess behavior to make your tests more independent. pytest-xdist # Run tests in parallel on multiple cores pytest-timeout # Add timeouts to your tests diff --git a/pkgs/clan-vm-manager/pyproject.toml b/pkgs/clan-vm-manager/pyproject.toml index 3196965c7..6e39b3fec 100644 --- a/pkgs/clan-vm-manager/pyproject.toml +++ b/pkgs/clan-vm-manager/pyproject.toml @@ -25,7 +25,7 @@ testpaths = "tests" faulthandler_timeout = 60 log_level = "DEBUG" log_format = "%(levelname)s: %(message)s\n %(pathname)s:%(lineno)d::%(funcName)s" -addopts = "--cov . --cov-report term --cov-report html:.reports/html --no-cov-on-fail --durations 5 --color=yes --new-first" # Add --pdb for debugging +addopts = "--durations 5 --color=yes --new-first" # Add --pdb for debugging norecursedirs = "tests/helpers" markers = ["impure"] diff --git a/pkgs/generate-test-vars/pyproject.toml b/pkgs/generate-test-vars/pyproject.toml index d6052d9d2..3347a9efa 100644 --- a/pkgs/generate-test-vars/pyproject.toml +++ b/pkgs/generate-test-vars/pyproject.toml @@ -22,7 +22,7 @@ testpaths = "tests" faulthandler_timeout = 60 log_level = "DEBUG" log_format = "%(levelname)s: %(message)s\n %(pathname)s:%(lineno)d::%(funcName)s" -addopts = "--cov . --cov-report term --cov-report html:.reports/html --no-cov-on-fail --durations 5 --color=yes --new-first" # Add --pdb for debugging +addopts = "--durations 5 --color=yes --new-first" # Add --pdb for debugging norecursedirs = "tests/helpers" [tool.mypy]