Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Fix installer test evaluation

+4 -4
+4 -4
nixos/tests/installer.nix
··· 193 193 194 194 makeInstallerTest = 195 195 { createPartitions, fileSystems, testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }: 196 - makeTest ({ ... }: { 196 + makeTest { 197 197 inherit iso; 198 198 nodes = if testChannel then { inherit webserver; } else { }; 199 199 testScript = testScriptFun { 200 200 inherit createPartitions fileSystems testChannel grubVersion grubDevice; 201 201 }; 202 - }); 202 + }; 203 203 204 204 205 205 in { ··· 329 329 }; 330 330 331 331 # Rebuild the CD configuration with a little modification. 332 - rebuildCD = makeTest ({ ... }: 332 + rebuildCD = makeTest 333 333 { inherit iso; 334 334 nodes = { }; 335 335 testScript = ··· 353 353 354 354 $machine->shutdown; 355 355 ''; 356 - }); 356 + }; 357 357 }