Unverified Commit 7e38f9e9 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

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

nixos/tests/apfs: clean up code
parents 44956ebc 7573c269

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 {};

nixos/tests/apfs.nix

+4 −4
Original line number Diff line number Diff line 
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",

      )

  '';

})
 
}

pkgs/os-specific/linux/apfs/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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";