From 9b1025c7fdf7acef2c7ba6fd79e454395a7e5ef2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 10 Aug 2025 18:25:57 +0200 Subject: [PATCH] nixos/test-driver: always respect --dump-vsock Before, the vsocks the test-run will use were only printed in interactive mode. However, with `enableDebugHook = true;` this functionality can also be used via `breakpointHook` within the build sandbox, i.e. in the non-interactive mode. I misremembered how much effort this is to fix, otherwise, I would've added this to #422066 already ;) --- nixos/lib/test-driver/src/test_driver/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/lib/test-driver/src/test_driver/__init__.py b/nixos/lib/test-driver/src/test_driver/__init__.py index 823a948bc41b..422cf3917233 100755 --- a/nixos/lib/test-driver/src/test_driver/__init__.py +++ b/nixos/lib/test-driver/src/test_driver/__init__.py @@ -148,11 +148,11 @@ def main() -> None: args.global_timeout, debug=debugger, ) as driver: + if offset := args.dump_vsocks: + driver.dump_machine_ssh(offset) if args.interactive: history_dir = os.getcwd() history_path = os.path.join(history_dir, ".nixos-test-history") - if offset := args.dump_vsocks: - driver.dump_machine_ssh(offset) ptpython.ipython.embed( user_ns=driver.test_symbols(), history_filename=history_path,