Merge pull request #236104 from Luflosi/apfs-test-module-based-runner

nixos/tests/apfs: clean up code
This commit is contained in:
Sandro 2023-06-21 19:19:36 +02:00 committed by GitHub
commit 7e38f9e981
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View file

@ -108,7 +108,7 @@ in {
alps = handleTest ./alps.nix {};
amazon-init-shell = handleTest ./amazon-init-shell.nix {};
apcupsd = handleTest ./apcupsd.nix {};
apfs = handleTest ./apfs.nix {};
apfs = runTest ./apfs.nix;
apparmor = handleTest ./apparmor.nix {};
atd = handleTest ./atd.nix {};
atop = handleTest ./atop.nix {};

View file

@ -1,8 +1,8 @@
import ./make-test-python.nix ({ pkgs, ... }: {
{ lib, ... }: {
name = "apfs";
meta.maintainers = with pkgs.lib.maintainers; [ Luflosi ];
meta.maintainers = with lib.maintainers; [ Luflosi ];
nodes.machine = { pkgs, ... }: {
nodes.machine = {
virtualisation.emptyDiskImages = [ 1024 ];
boot.supportedFilesystems = [ "apfs" ];
@ -62,4 +62,4 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"apfsck /dev/vdb",
)
'';
})
}

View file

@ -28,7 +28,7 @@ stdenv.mkDerivation {
"INSTALL_MOD_PATH=$(out)"
];
passthru.tests.test = nixosTests.apfs;
passthru.tests.apfs = nixosTests.apfs;
meta = with lib; {
description = "APFS module for linux";