From ece6acc1e38c944b4bedad2bfc175b0d16e3506d Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 18 Apr 2026 16:16:56 -0400 Subject: [PATCH] nixos-test-driver: fix handling of type-check-disabled case f1bcb61731224bd8440510fc620d3c51f3e51c85 did not handle this correctly, causing failures (e.g. https://hydra.nixos.org/build/326659503/nixlog/2/tail) --- nixos/lib/test-driver/src/test_driver/__init__.py | 6 +++++- nixos/lib/testing/driver.nix | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/src/test_driver/__init__.py b/nixos/lib/test-driver/src/test_driver/__init__.py index 20f668867da6..1e5a062b18c8 100644 --- a/nixos/lib/test-driver/src/test_driver/__init__.py +++ b/nixos/lib/test-driver/src/test_driver/__init__.py @@ -174,7 +174,11 @@ def generate_driver_symbols() -> None: vlans=[], global_timeout=0, enable_ssh_backdoor=False, - test_script=Path("testScriptWithTypes"), + test_script=( + Path("testScriptWithTypes") + if (Path("testScriptWithTypes").is_file()) + else Path("testScriptFile") + ), ), out_dir=Path(), logger=CompositeLogger([]), diff --git a/nixos/lib/testing/driver.nix b/nixos/lib/testing/driver.nix index f49f1fe199b1..c6802d61dd43 100644 --- a/nixos/lib/testing/driver.nix +++ b/nixos/lib/testing/driver.nix @@ -85,6 +85,8 @@ let testScriptWithTypes ''} + echo -n "$testScript" > testScriptFile + cp "${config.driverConfiguration.test_script}" $out/test-script ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-test-driver