From 69c717ae1f58de4e495e58a54f4441a52356fb9c Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Sat, 8 Mar 2025 16:10:55 +0900 Subject: [PATCH] Tests: reconfigure pytest test folder after moving it into clan_cli --- checks/impure/flake-module.nix | 2 +- pkgs/clan-app/default.nix | 2 +- pkgs/clan-cli/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/impure/flake-module.nix b/checks/impure/flake-module.nix index 71a3446a3..d8cb4752f 100644 --- a/checks/impure/flake-module.nix +++ b/checks/impure/flake-module.nix @@ -30,7 +30,7 @@ # this disables dynamic dependency loading in clan-cli export CLAN_NO_DYNAMIC_DEPS=1 - nix develop "$ROOT#clan-cli" -c bash -c "TMPDIR=/tmp python -m pytest -m impure ./tests $@" + nix develop "$ROOT#clan-cli" -c bash -c "TMPDIR=/tmp python -m pytest -m impure ./clan_cli/tests $@" ''; }; } diff --git a/pkgs/clan-app/default.nix b/pkgs/clan-app/default.nix index 0112f6681..be0850e6f 100644 --- a/pkgs/clan-app/default.nix +++ b/pkgs/clan-app/default.nix @@ -118,7 +118,7 @@ pythonRuntime.pkgs.buildPythonApplication { echo "STARTING ..." export WEBVIEW_LIB_DIR="${webview-lib}/lib" export NIX_STATE_DIR=$TMPDIR/nix IN_NIX_SANDBOX=1 - python -m pytest -s -m "not impure" ./tests + python -m pytest -s -m "not impure" ./clan_cli/tests touch $out ''; }; diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix index d58a0cce5..0fd0f47cc 100644 --- a/pkgs/clan-cli/default.nix +++ b/pkgs/clan-cli/default.nix @@ -156,7 +156,7 @@ pythonRuntime.pkgs.buildPythonApplication { # limit build cores to 16 jobs="$((NIX_BUILD_CORES>16 ? 16 : NIX_BUILD_CORES))" - python -m pytest -m "not impure and not with_core" -n $jobs ./tests + python -m pytest -m "not impure and not with_core" -n $jobs ./clan_cli/tests touch $out ''; } @@ -209,7 +209,7 @@ pythonRuntime.pkgs.buildPythonApplication { # limit build cores to 16 jobs="$((NIX_BUILD_CORES>16 ? 16 : NIX_BUILD_CORES))" - python -m pytest -m "not impure and with_core" ./tests -n $jobs + python -m pytest -m "not impure and with_core" ./clan_cli/tests -n $jobs touch $out ''; };