Compare commits

..

No commits in common. "f7c2c441acbc1659c02ca0a1f996530b0a6ee1d4" and "8aabd1466ec2f81cb902f2e8a70a383a17a704af" have entirely different histories.

2 changed files with 11 additions and 12 deletions

View File

@ -57,9 +57,6 @@ 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;
@ -88,12 +85,9 @@ testPkgs.testers.runNixOSTest {
# Wait for minecraft service to be available
machine.wait_for_unit("minecraft-server-main.service")
machine.sleep(60)
machine.sleep(20)
# 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,22 +30,27 @@ 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 = with pkgs; [
parted
ensureZfsMounts
environment.systemPackages = [
pkgs.parted
pkgs.ensureZfsMounts
];
systemd.services.foobar = {
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStart = lib.getExe pkgs.bash;
ExecStart = "${lib.getExe pkgs.bash} -c \"true\"";
};
};
@ -53,7 +58,7 @@ testPkgs.testers.runNixOSTest {
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStart = lib.getExe pkgs.bash;
ExecStart = "${lib.getExe pkgs.bash} -c \"true\"";
};
};
};