diff options
| author | Florian Friesdorf <flo@chaoflow.net> | 2014-06-28 16:04:49 +0200 |
|---|---|---|
| committer | Florian Friesdorf <flo@chaoflow.net> | 2014-06-28 16:05:47 +0200 |
| commit | 9b7dbcc83e2b8c8fcb37bc204bba83311e17eca0 (patch) | |
| tree | 59fca418d2ce4d72f5307fa603085353604ff958 /nixos/tests/installer.nix | |
| parent | 6a3e6164bd45eae413c70d3a98e32895b832539f (diff) | |
| download | nixpkgs-9b7dbcc83e2b8c8fcb37bc204bba83311e17eca0.tar nixpkgs-9b7dbcc83e2b8c8fcb37bc204bba83311e17eca0.tar.gz nixpkgs-9b7dbcc83e2b8c8fcb37bc204bba83311e17eca0.tar.bz2 nixpkgs-9b7dbcc83e2b8c8fcb37bc204bba83311e17eca0.tar.lz nixpkgs-9b7dbcc83e2b8c8fcb37bc204bba83311e17eca0.tar.xz nixpkgs-9b7dbcc83e2b8c8fcb37bc204bba83311e17eca0.tar.zst nixpkgs-9b7dbcc83e2b8c8fcb37bc204bba83311e17eca0.zip | |
name nixos tests, close #3078
Diffstat (limited to 'nixos/tests/installer.nix')
| -rw-r--r-- | nixos/tests/installer.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 98e8142a0df..1cd1aa63a55 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -215,10 +215,11 @@ let ''; - makeInstallerTest = + makeInstallerTest = name: { createPartitions, testChannel ? false, useEFI ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }: makeTest { inherit iso; + name = "installer-" + name; nodes = if testChannel then { inherit webserver; } else { }; testScript = testScriptFun { inherit createPartitions testChannel useEFI grubVersion grubDevice; @@ -233,7 +234,7 @@ in { # The (almost) simplest partitioning scheme: a swap partition and # one big filesystem partition. - simple = makeInstallerTest + simple = makeInstallerTest "simple" { createPartitions = '' $machine->succeed( @@ -251,7 +252,7 @@ in { }; # Same as the previous, but now with a separate /boot partition. - separateBoot = makeInstallerTest + separateBoot = makeInstallerTest "separateBoot" { createPartitions = '' $machine->succeed( @@ -273,7 +274,7 @@ in { # Create two physical LVM partitions combined into one volume group # that contains the logical swap and root partitions. - lvm = makeInstallerTest + lvm = makeInstallerTest "lvm" { createPartitions = '' $machine->succeed( @@ -295,7 +296,7 @@ in { ''; }; - swraid = makeInstallerTest + swraid = makeInstallerTest "swraid" { createPartitions = '' $machine->succeed( @@ -328,7 +329,7 @@ in { }; # Test a basic install using GRUB 1. - grub1 = makeInstallerTest + grub1 = makeInstallerTest "grub1" { createPartitions = '' $machine->succeed( @@ -348,7 +349,7 @@ in { }; # Test an EFI install. - efi = makeInstallerTest + efi = makeInstallerTest "efi" { createPartitions = '' $machine->succeed( @@ -369,6 +370,7 @@ in { # Rebuild the CD configuration with a little modification. rebuildCD = makeTest { inherit iso; + name = "rebuild-CD"; nodes = { }; testScript = '' |