b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
nixos/tests/apfs: clean up code
This commit is contained in:
Sandro 2023-06-21 19:19:36 +02:00 committed by GitHub
parent 44956ebcbc 7573c269a8
commit 7e38f9e981
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View file

@ -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 {};

8
nixos/tests/apfs.nix
View file

@ -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",
) )
''; '';
}) }

2
pkgs/os-specific/linux/apfs/default.nix
View file

@ -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";