From b1cc7d80cac16698e7ffc166b331ddeea7420bab Mon Sep 17 00:00:00 2001 From: TheRealGramdalf Date: Mon, 29 Jun 2026 16:12:06 -0700 Subject: [PATCH] nixosTests.dashy: use systemd-nspawn instead of qemu --- nixos/tests/web-apps/dashy.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/nixos/tests/web-apps/dashy.nix b/nixos/tests/web-apps/dashy.nix index 39454b5b8d8a..d83c14d3294f 100644 --- a/nixos/tests/web-apps/dashy.nix +++ b/nixos/tests/web-apps/dashy.nix @@ -1,6 +1,5 @@ { pkgs, lib, ... }: let - customSettings = { pageInfo = { title = "My Custom Dashy Title"; @@ -45,29 +44,29 @@ in } ]; }; - nodes = { - machine = { }; + containers = { + container = { }; - machine-custom = { + custom = { services.dashy.settings = customSettings; }; }; testScript = '' start_all() - machine.wait_for_unit("nginx.service") - machine.wait_for_open_port(80) + container.wait_for_unit("nginx.service") + container.wait_for_open_port(80) - actual = machine.succeed("curl -v --stderr - http://dashy.local/", timeout=10) + actual = container.succeed("curl -v --stderr - http://dashy.local/", timeout=10) expected = "Dashy" assert expected in actual, \ f"unexpected reply from Dashy, expected: '{expected}' got: '{actual}'" - machine_custom.wait_for_unit("nginx.service") - machine_custom.wait_for_open_port(80) + custom.wait_for_unit("nginx.service") + custom.wait_for_open_port(80) - actual_custom = machine_custom.succeed("curl -s --stderr - http://dashy.local/conf.yml", timeout=10).strip() - expected_custom = machine_custom.succeed("cat ${customSettingsYaml}").strip() + actual_custom = custom.succeed("curl -s --stderr - http://dashy.local/conf.yml", timeout=10).strip() + expected_custom = custom.succeed("cat ${customSettingsYaml}").strip() assert expected_custom == actual_custom, \ f"unexpected reply from Dashy, expected: '{expected_custom}' got: '{actual_custom}'"