From 301fe041c42549f76ed51304b7b344ae3e5085c0 Mon Sep 17 00:00:00 2001 From: Qyriad Date: Thu, 5 Mar 2026 15:44:58 +0100 Subject: [PATCH] add --no-reexec to nixos-rebuild in the VM tests --- tests/distccd/test-script.py | 4 ++-- tests/gotosocial/test-script.py | 4 ++-- tests/harmonia/test-script.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/distccd/test-script.py b/tests/distccd/test-script.py index 3678155..8a34d8a 100644 --- a/tests/distccd/test-script.py +++ b/tests/distccd/test-script.py @@ -94,7 +94,7 @@ assert args.job_lifetime == 900, f'{args.job_lifetime} != 900' assert args.log_level == 'warning', f'{args.log_level=} != warning' with machine.nested("must succeed: initial nixos-rebuild switch"): - machine.succeed("env PAGER= nixos-rebuild switch --log-format raw-with-logs --fallback") + machine.succeed("env PAGER= nixos-rebuild switch --log-format raw-with-logs --no-reexec --fallback") # Config should not have changed. args = get_cli_args() @@ -122,7 +122,7 @@ assert args.job_lifetime == 900, f'{args.job_lifetime} != 900' assert args.log_level == new_log_level, f'{args.log_level=} != {new_log_level=}' # And this should set everything back. -machine.succeed("env PAGER= nixos-rebuild switch --log-format raw-with-logs --fallback") +machine.succeed("env PAGER= nixos-rebuild switch --log-format raw-with-logs --no-reexec --fallback") args = get_cli_args() assert args.jobs == 12, f'{args.jobs=} != 12' assert args.job_lifetime == 900, f'{args.job_lifetime} != 900' diff --git a/tests/gotosocial/test-script.py b/tests/gotosocial/test-script.py index 51a303f..d41d3d1 100644 --- a/tests/gotosocial/test-script.py +++ b/tests/gotosocial/test-script.py @@ -76,7 +76,7 @@ dynix_out = machine.succeed("dynix --version") assert "dynix" in dynix_out, f"dynix not in {dynix_out=}" machine.log("REBUILDING configuration inside VM") -machine.succeed("env PAGER= nixos-rebuild switch --log-format raw-with-logs --fallback") +machine.succeed("env PAGER= nixos-rebuild switch --log-format raw-with-logs --no-reexec --fallback") machine.wait_for_unit("gotosocial.service") # Make sure the config before any dynamic changes is what we expect. @@ -107,7 +107,7 @@ except StopIteration: assert new_app_name in application_name, f"'{new_app_name}' should be in {application_name=}" machine.log("REBUILDING configuration inside VM") -machine.succeed("env PAGER= nixos-rebuild switch --log-format raw-with-logs --fallback") +machine.succeed("env PAGER= nixos-rebuild switch --log-format raw-with-logs --no-reexec --fallback") machine.wait_for_unit("gotosocial.service") diff --git a/tests/harmonia/test-script.py b/tests/harmonia/test-script.py index bdac573..376e946 100644 --- a/tests/harmonia/test-script.py +++ b/tests/harmonia/test-script.py @@ -82,7 +82,7 @@ assert int(config_toml['workers']) == 4, f"{config_toml['workers']=} != 4" assert int(config_toml['max_connection_rate']) == 256, f"{config_toml['max_connection_rate']=} != 256" with machine.nested("must succeed: initial nixos-rebuild switch"): - machine.succeed("env PAGER= nixos-rebuild switch --log-format raw-with-logs --fallback") + machine.succeed("env PAGER= nixos-rebuild switch --log-format raw-with-logs --no-reexec -v --fallback") # Config should not have changed. config_toml = get_config_file() @@ -108,7 +108,7 @@ assert int(config_toml['max_connection_rate']) == new_max_connection_rate, f"{co assert int(config_toml['workers']) == new_workers, f"{config_toml['workers']=} != {new_workers}" # And this should set everything back. -machine.succeed("env PAGER= nixos-rebuild switch --log-format raw-with-logs --fallback") +machine.succeed("env PAGER= nixos-rebuild switch --log-format raw-with-logs --no-reexec -v --fallback") machine.wait_for_unit("harmonia.service") config_toml = get_config_file() assert int(config_toml['max_connection_rate']) == 256, f'{config_toml["max_connection_rate"]=} != 256'