From 8717b642a9ce3a76a5b10bf7d85634da13a6d6cb Mon Sep 17 00:00:00 2001 From: glyph Date: Sun, 29 Mar 2026 12:51:09 +0200 Subject: [PATCH] sabnzbd: clean up test script --- nixos/tests/sabnzbd-module.nix | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/nixos/tests/sabnzbd-module.nix b/nixos/tests/sabnzbd-module.nix index 1918bf965091..3eb9bd21e2ff 100644 --- a/nixos/tests/sabnzbd-module.nix +++ b/nixos/tests/sabnzbd-module.nix @@ -106,29 +106,16 @@ in }; testScript = '' - machine.wait_for_unit("sabnzbd.service") - machine.wait_until_succeeds( - "curl --fail -L http://localhost:8080/" - ) + def wait_for_up(m): + m.wait_for_unit("sabnzbd.service") + m.wait_until_succeeds("curl --fail -L http://localhost:8080") + + wait_for_up(machine) + wait_for_up(with_writeable_config) + wait_for_up(with_raw_config_file) machine.succeed("do_test") - - - - with_writeable_config.wait_for_unit("sabnzbd.service") - with_writeable_config.wait_until_succeeds( - "curl --fail -L http://localhost:8080/" - ) - with_writeable_config.succeed("do_test") - - - - with_raw_config_file.wait_for_unit("sabnzbd.service") - with_raw_config_file.wait_until_succeeds( - "curl --fail -L http://localhost:8080/" - ) - with_raw_config_file.succeed("do_test_2") ''; }