Compare commits

...

2 Commits

Author SHA1 Message Date
f7c2c441ac
minecraft: fix nix test 2025-10-24 14:40:28 -04:00
a455d592b4
zfs_ensure_mounted: cleanup test 2025-10-24 13:46:22 -04:00
2 changed files with 12 additions and 11 deletions

View File

@ -57,6 +57,9 @@ testPkgs.testers.runNixOSTest {
# Enable caddy service (required by minecraft service)
services.caddy.enable = true;
# Enable networking for the test (needed for minecraft mods to download mappings)
networking.dhcpcd.enable = true;
# Disable the ZFS mount dependency service in test environment
systemd.services."minecraft-server-main_mounts".enable = lib.mkForce false;
@ -85,9 +88,12 @@ testPkgs.testers.runNixOSTest {
# Wait for minecraft service to be available
machine.wait_for_unit("minecraft-server-main.service")
machine.sleep(20)
machine.sleep(60)
# Check that the service is active and not failed
machine.succeed("systemctl is-active minecraft-server-main.service")
# Check for the Minecraft server startup completion message
machine.succeed("grep -Eq '\\[[0-9]+:[0-9]+:[0-9]+\\] \\[Server thread/INFO\\]: Done \\([0-9]+\\.[0-9]+s\\)! For help, type \"help\"' /var/lib/minecraft/main/logs/latest.log")
'';
}

View File

@ -30,27 +30,22 @@ testPkgs.testers.runNixOSTest {
emptyDiskImages = [
4096
];
useBootLoader = true;
useEFIBoot = true;
};
boot.loader.systemd-boot.enable = true;
boot.loader.timeout = 0;
boot.loader.efi.canTouchEfiVariables = true;
networking.hostId = "deadbeef";
boot.kernelPackages = config.boot.kernelPackages;
boot.zfs.package = config.boot.zfs.package;
boot.supportedFilesystems = [ "zfs" ];
environment.systemPackages = [
pkgs.parted
pkgs.ensureZfsMounts
environment.systemPackages = with pkgs; [
parted
ensureZfsMounts
];
systemd.services.foobar = {
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStart = "${lib.getExe pkgs.bash} -c \"true\"";
ExecStart = lib.getExe pkgs.bash;
};
};
@ -58,7 +53,7 @@ testPkgs.testers.runNixOSTest {
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStart = "${lib.getExe pkgs.bash} -c \"true\"";
ExecStart = lib.getExe pkgs.bash;
};
};
};