yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'clan-cli: Add passthru.sourceWithTest for container_test.py' (#5623) from Qubasa/clan-core:passthru_test into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/5623
This commit is contained in:
Luis Hebendanz
2025-10-22 12:54:37 +00:00
parent 9851993b82 841e9135fe
commit 5f6e0540cd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
checks/systemd-abstraction/default.nix
View File

@@ -62,6 +62,6 @@ in
peer1.succeed("chmod 640 /var/log/journal/*/user-1000.journal*") peer1.succeed("chmod 640 /var/log/journal/*/user-1000.journal*")
# Run tests as text-user (environment variables are set automatically) # Run tests as text-user (environment variables are set automatically)
peer1.succeed("su - text-user -c 'pytest -s -n0 ${cli}/${cli.pythonRuntime.sitePackages}/clan_lib/service_runner'") peer1.succeed("su - text-user -c 'pytest -p no:cacheprovider -o addopts="" -s -n0 ${cli.passthru.sourceWithTests}/clan_lib/service_runner'")
''; '';
} }

2
pkgs/clan-cli/default.nix
View File

@@ -103,7 +103,6 @@ let
_root: path: _type: _root: path: _type:
(builtins.match ".*/test_[^/]+\.py" path) != null # matches test_*.py (builtins.match ".*/test_[^/]+\.py" path) != null # matches test_*.py
&& (builtins.match ".*/[^/]+_test\.py" path) != null # matches *_test.py && (builtins.match ".*/[^/]+_test\.py" path) != null # matches *_test.py
&& (builtins.match ".*/container_test\.py" path) == null # doesn't match container_test.py
) )
]; ];
} }
@@ -301,6 +300,7 @@ pythonRuntime.pkgs.buildPythonApplication {
passthru.runtimeDependenciesMap = bundledRuntimeDependenciesMap; passthru.runtimeDependenciesMap = bundledRuntimeDependenciesMap;
passthru.testRuntimeDependencies = testRuntimeDependencies; passthru.testRuntimeDependencies = testRuntimeDependencies;
passthru.testRuntimeDependenciesMap = testRuntimeDependenciesMap; passthru.testRuntimeDependenciesMap = testRuntimeDependenciesMap;
passthru.sourceWithTests = sourceWithTests;
# Nixpkgs doesn't get copied from `src` as it's not in `package-data` in `pyproject.toml` # Nixpkgs doesn't get copied from `src` as it's not in `package-data` in `pyproject.toml`
# as it significantly slows down the build so we copy it again here # as it significantly slows down the build so we copy it again here