maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(snix/boot/tests): add name attr to mkBootTest

Browse source 
Previously when running all boot integration tests with
`mg build //snix/boot:tests`, and one of them failing, it was not clear
which one failed, because on failed test derivation name shown used the
same suffix for all tests. Now, for a cost of a bit more boilerplate,
test derivation name contains its name, so it's immediately obvious.

Change-Id: If8766e12048a50f21d61c615239ee62b3361ac2f
Reviewed-on: https://cl.snix.dev/c/snix/+/30674
Reviewed-by: Florian Klink <flokli@flokli.de>
Tested-by: besadii
This commit is contained in:
rszyma 2025-08-10 17:58:32 +02:00
parent 91d02d8c84
commit 449446a5a7
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
snix/boot/tests/default.nix
View file

@ -12,6 +12,9 @@ let
# or specify what init should be booted. # or specify what init should be booted.
mkBootTest = mkBootTest =
{ {
# Test name.
name,
blobServiceAddr ? "memory://", blobServiceAddr ? "memory://",
directoryServiceAddr ? "memory://", directoryServiceAddr ? "memory://",
pathInfoServiceAddr ? "memory://", pathInfoServiceAddr ? "memory://",
@ -46,7 +49,7 @@ let
pkgs.stdenv.mkDerivation ( pkgs.stdenv.mkDerivation (
{ {
name = "run-vm"; name = "test-boot-${name}";
nativeBuildInputs = [ nativeBuildInputs = [
depot.snix.store depot.snix.store
@ -186,12 +189,15 @@ in
depot.nix.readTree.drvTargets { depot.nix.readTree.drvTargets {
docs-memory = ( docs-memory = (
mkBootTest { mkBootTest {
name = "docs-memory";
path = ../../docs; path = ../../docs;
importPathName = "docs"; importPathName = "docs";
} }
); );
docs-persistent = ( docs-persistent = (
mkBootTest { mkBootTest {
name = "docs-persistent";
blobServiceAddr = "objectstore+file:///build/blobs"; blobServiceAddr = "objectstore+file:///build/blobs";
directoryServiceAddr = "redb:///build/directories.redb"; directoryServiceAddr = "redb:///build/directories.redb";
pathInfoServiceAddr = "redb:///build/pathinfo.redb"; pathInfoServiceAddr = "redb:///build/pathinfo.redb";
@ -202,6 +208,7 @@ depot.nix.readTree.drvTargets {
closure-snix = ( closure-snix = (
mkBootTest { mkBootTest {
name = "closure-snix";
blobServiceAddr = "objectstore+file:///build/blobs"; blobServiceAddr = "objectstore+file:///build/blobs";
path = depot.snix.store; path = depot.snix.store;
isClosure = true; isClosure = true;
@ -210,6 +217,7 @@ depot.nix.readTree.drvTargets {
closure-nixos = ( closure-nixos = (
mkBootTest { mkBootTest {
name = "closure-nixos";
blobServiceAddr = "objectstore+file:///build/blobs"; blobServiceAddr = "objectstore+file:///build/blobs";
pathInfoServiceAddr = "redb:///build/pathinfo.redb"; pathInfoServiceAddr = "redb:///build/pathinfo.redb";
directoryServiceAddr = "redb:///build/directories.redb"; directoryServiceAddr = "redb:///build/directories.redb";
@ -222,6 +230,7 @@ depot.nix.readTree.drvTargets {
closure-nixos-bigtable = ( closure-nixos-bigtable = (
mkBootTest { mkBootTest {
name = "closure-nixos-bigtable";
blobServiceAddr = "objectstore+file:///build/blobs"; blobServiceAddr = "objectstore+file:///build/blobs";
directoryServiceAddr = "bigtable://instance-1?project_id=project-1&table_name=directories&family_name=cf1"; directoryServiceAddr = "bigtable://instance-1?project_id=project-1&table_name=directories&family_name=cf1";
pathInfoServiceAddr = "bigtable://instance-1?project_id=project-1&table_name=pathinfos&family_name=cf1"; pathInfoServiceAddr = "bigtable://instance-1?project_id=project-1&table_name=pathinfos&family_name=cf1";
@ -245,6 +254,7 @@ depot.nix.readTree.drvTargets {
closure-nixos-s3 = ( closure-nixos-s3 = (
mkBootTest { mkBootTest {
name = "closure-nixos-s3";
blobServiceAddr = "objectstore+s3://mybucket/blobs?aws_access_key_id=myaccesskey&aws_secret_access_key=supersecret&aws_endpoint_url=http%3A%2F%2Flocalhost%3A9000&aws_allow_http=1"; blobServiceAddr = "objectstore+s3://mybucket/blobs?aws_access_key_id=myaccesskey&aws_secret_access_key=supersecret&aws_endpoint_url=http%3A%2F%2Flocalhost%3A9000&aws_allow_http=1";
# we cannot use s3 here yet without any caching layer, as we don't allow "deeper" access to directories (non-root nodes) # we cannot use s3 here yet without any caching layer, as we don't allow "deeper" access to directories (non-root nodes)
# directoryServiceAddr = "objectstore+s3://mybucket/directories?aws_access_key_id=myaccesskey&aws_secret_access_key=supersecret&endpoint=http%3A%2F%2Flocalhost%3A9000&aws_allow_http=1"; # directoryServiceAddr = "objectstore+s3://mybucket/directories?aws_access_key_id=myaccesskey&aws_secret_access_key=supersecret&endpoint=http%3A%2F%2Flocalhost%3A9000&aws_allow_http=1";
@ -267,6 +277,7 @@ depot.nix.readTree.drvTargets {
closure-nixos-nar-bridge = ( closure-nixos-nar-bridge = (
mkBootTest { mkBootTest {
name = "closure-nixos-nar-bridge";
blobServiceAddr = "objectstore+file:///build/blobs"; blobServiceAddr = "objectstore+file:///build/blobs";
path = testSystem; path = testSystem;
useNarBridge = true; useNarBridge = true;