public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix installer test evaluation

Browse Source
This commit is contained in:
Eelco Dolstra
2014-04-14 16:24:08 +02:00
parent 5d6c6abe50
commit 4f2aa2f706
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/tests/installer.nix
+4 -4
View File
@@ -193,13 +193,13 @@ let
makeInstallerTest = makeInstallerTest =
{ createPartitions, fileSystems, testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }: { createPartitions, fileSystems, testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }:
makeTest ({ ... }: { makeTest {
inherit iso; inherit iso;
nodes = if testChannel then { inherit webserver; } else { }; nodes = if testChannel then { inherit webserver; } else { };
testScript = testScriptFun { testScript = testScriptFun {
inherit createPartitions fileSystems testChannel grubVersion grubDevice; inherit createPartitions fileSystems testChannel grubVersion grubDevice;
}; };
}); };
in { in {
@@ -329,7 +329,7 @@ in {
}; };
# Rebuild the CD configuration with a little modification. # Rebuild the CD configuration with a little modification.
rebuildCD = makeTest ({ ... }: rebuildCD = makeTest
{ inherit iso; { inherit iso;
nodes = { }; nodes = { };
testScript = testScript =
@@ -353,5 +353,5 @@ in {
$machine->shutdown; $machine->shutdown;
''; '';
}); };
} }