Merge pull request #236104 from Luflosi/apfs-test-module-based-runner
nixos/tests/apfs: clean up code
This commit is contained in:
commit
7e38f9e981
|
@ -108,7 +108,7 @@ in {
|
||||||
alps = handleTest ./alps.nix {};
|
alps = handleTest ./alps.nix {};
|
||||||
amazon-init-shell = handleTest ./amazon-init-shell.nix {};
|
amazon-init-shell = handleTest ./amazon-init-shell.nix {};
|
||||||
apcupsd = handleTest ./apcupsd.nix {};
|
apcupsd = handleTest ./apcupsd.nix {};
|
||||||
apfs = handleTest ./apfs.nix {};
|
apfs = runTest ./apfs.nix;
|
||||||
apparmor = handleTest ./apparmor.nix {};
|
apparmor = handleTest ./apparmor.nix {};
|
||||||
atd = handleTest ./atd.nix {};
|
atd = handleTest ./atd.nix {};
|
||||||
atop = handleTest ./atop.nix {};
|
atop = handleTest ./atop.nix {};
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
import ./make-test-python.nix ({ pkgs, ... }: {
|
{ lib, ... }: {
|
||||||
name = "apfs";
|
name = "apfs";
|
||||||
meta.maintainers = with pkgs.lib.maintainers; [ Luflosi ];
|
meta.maintainers = with lib.maintainers; [ Luflosi ];
|
||||||
|
|
||||||
nodes.machine = { pkgs, ... }: {
|
nodes.machine = {
|
||||||
virtualisation.emptyDiskImages = [ 1024 ];
|
virtualisation.emptyDiskImages = [ 1024 ];
|
||||||
|
|
||||||
boot.supportedFilesystems = [ "apfs" ];
|
boot.supportedFilesystems = [ "apfs" ];
|
||||||
|
@ -62,4 +62,4 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||||
"apfsck /dev/vdb",
|
"apfsck /dev/vdb",
|
||||||
)
|
)
|
||||||
'';
|
'';
|
||||||
})
|
}
|
||||||
|
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation {
|
||||||
"INSTALL_MOD_PATH=$(out)"
|
"INSTALL_MOD_PATH=$(out)"
|
||||||
];
|
];
|
||||||
|
|
||||||
passthru.tests.test = nixosTests.apfs;
|
passthru.tests.apfs = nixosTests.apfs;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "APFS module for linux";
|
description = "APFS module for linux";
|
||||||
|
|
Loading…
Reference in a new issue