tangled
alpha
login
or
join now
tjh.dev
/
nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
0
fork
atom
overview
issues
pulls
pipelines
Fix installer test evaluation
Eelco Dolstra
12 years ago
4f2aa2f7
5d6c6abe
+4
-4
1 changed file
expand all
collapse all
unified
split
nixos
tests
installer.nix
+4
-4
nixos/tests/installer.nix
···
193
194
makeInstallerTest =
195
{ createPartitions, fileSystems, testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }:
196
-
makeTest ({ ... }: {
197
inherit iso;
198
nodes = if testChannel then { inherit webserver; } else { };
199
testScript = testScriptFun {
200
inherit createPartitions fileSystems testChannel grubVersion grubDevice;
201
};
202
-
});
203
204
205
in {
···
329
};
330
331
# Rebuild the CD configuration with a little modification.
332
-
rebuildCD = makeTest ({ ... }:
333
{ inherit iso;
334
nodes = { };
335
testScript =
···
353
354
$machine->shutdown;
355
'';
356
-
});
357
}
···
193
194
makeInstallerTest =
195
{ createPartitions, fileSystems, testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }:
196
+
makeTest {
197
inherit iso;
198
nodes = if testChannel then { inherit webserver; } else { };
199
testScript = testScriptFun {
200
inherit createPartitions fileSystems testChannel grubVersion grubDevice;
201
};
202
+
};
203
204
205
in {
···
329
};
330
331
# Rebuild the CD configuration with a little modification.
332
+
rebuildCD = makeTest
333
{ inherit iso;
334
nodes = { };
335
testScript =
···
353
354
$machine->shutdown;
355
'';
356
+
};
357
}