talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

nixosTests.fsck{,-systemd-stage-1}: handleTest -> runTest

Browse Source
This commit is contained in:
Sizhe Zhao 2025-06-07 21:53:15 +08:00
parent da6ecbe539
commit bc32ab809c
No known key found for this signature in database
GPG Key ID: ED1807251A7DA08F
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/tests/all-tests.nix
View File

@ -557,8 +557,14 @@ in
froide-govplan = runTest ./web-apps/froide-govplan.nix; froide-govplan = runTest ./web-apps/froide-govplan.nix;
frp = runTest ./frp.nix; frp = runTest ./frp.nix;
frr = runTest ./frr.nix; frr = runTest ./frr.nix;
fsck = handleTest ./fsck.nix { }; fsck = runTest {
fsck-systemd-stage-1 = handleTest ./fsck.nix { systemdStage1 = true; }; imports = [ ./fsck.nix ];
_module.args.systemdStage1 = false;
};
fsck-systemd-stage-1 = runTest {
imports = [ ./fsck.nix ];
_module.args.systemdStage1 = true;
};
ft2-clone = runTest ./ft2-clone.nix; ft2-clone = runTest ./ft2-clone.nix;
legit = runTest ./legit.nix; legit = runTest ./legit.nix;
mimir = runTest ./mimir.nix; mimir = runTest ./mimir.nix;

31
nixos/tests/fsck.nix
View File

@ -1,29 +1,22 @@
{ { systemdStage1, ... }:
system ? builtins.currentSystem,
config ? { },
pkgs ? import ../.. { inherit system config; },
systemdStage1 ? false,
}:
import ./make-test-python.nix { {
name = "fsck"; name = "fsck";
nodes.machine = nodes.machine = {
{ lib, ... }: virtualisation.emptyDiskImages = [ 1 ];
{
virtualisation.emptyDiskImages = [ 1 ];
virtualisation.fileSystems = { virtualisation.fileSystems = {
"/mnt" = { "/mnt" = {
device = "/dev/vdb"; device = "/dev/vdb";
fsType = "ext4"; fsType = "ext4";
autoFormat = true; autoFormat = true;
};
}; };
boot.initrd.systemd.enable = systemdStage1;
}; };
boot.initrd.systemd.enable = systemdStage1;
};
testScript = testScript =
{ nodes, ... }: { nodes, ... }:
let let