From c58ead12efcac436afffa93a22099a5595eb4157 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 8 Jun 2026 14:22:41 -0500 Subject: [PATCH] voxtype: assert full service file in test Replace the piecemeal assertFileRegex checks with a single assertFileContent against the normalized unit, so the test pins the entire generated service file rather than a handful of lines. --- .../services/voxtype/basic-configuration.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/tests/modules/services/voxtype/basic-configuration.nix b/tests/modules/services/voxtype/basic-configuration.nix index 357e9103c..8defeaa4f 100644 --- a/tests/modules/services/voxtype/basic-configuration.nix +++ b/tests/modules/services/voxtype/basic-configuration.nix @@ -25,11 +25,26 @@ assertFileExists "$serviceFile" assertFileExists "$configFile" - assertFileRegex "$serviceFile" 'ExecStart=@voxtype@/bin/dummy daemon --verbose' - assertFileRegex "$serviceFile" 'Environment=PATH=.*/bin' - assertFileRegex "$serviceFile" 'Environment=WAYLAND_DISPLAY=wayland-1' - assertFileRegex "$serviceFile" 'Environment=VOXTYPE_TEST_ENV=1' - assertFileRegex "$serviceFile" 'X-Restart-Triggers=/nix/store/.*-voxtype-config.toml' + serviceFileNormalized="$(normalizeStorePaths "$serviceFile")" + assertFileContent "$serviceFileNormalized" ${builtins.toFile "expected.service" '' + [Install] + WantedBy=default.target + + [Service] + Environment=PATH=@which@/bin:@wl-clipboard@/bin:@wtype@/bin + Environment=XDG_RUNTIME_DIR=%t + Environment=WAYLAND_DISPLAY=wayland-1 + Environment=VOXTYPE_TEST_ENV=1 + ExecStart=@voxtype@/bin/dummy daemon --verbose + Restart=on-failure + RestartSec=5s + Type=exec + + [Unit] + Description=Voxtype speech-to-text daemon + PartOf=default.target + X-Restart-Triggers=/nix/store/00000000000000000000000000000000-voxtype-config.toml + ''} assertFileContent "$configFile" ${./expected-config.toml} '';