diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-03-01 19:02:36 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-03-01 19:02:36 +0100 |
| commit | 1f89aa6c7f2f16c8c0834cfa65b8484fecd72af3 (patch) | |
| tree | fcf09c9e25ad0f908d4fa35a9daffe0ebfacf654 | |
| parent | e45c211b50c6f473e3d92d29e1a8426ec4579f05 (diff) | |
nixos/tests: Remove tests.boot.boot* prefixes release-16.03-start
As @bobvanderlinden suggests in #13585: "Looks like that cleans things up quite a bit! Just one aesthetics note, the boot tests could now be renamed from boot.bootBiosCdrom to boot.biosCdrom in nixos/tests/boot.nix:L33. That makes them more consistent with the other tests." Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | nixos/release-combined.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/boot.nix | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 69cc357078d66..958e587444d80 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -63,7 +63,7 @@ in rec { (all nixos.tests.installer.btrfsSimple) (all nixos.tests.installer.btrfsSubvols) (all nixos.tests.installer.btrfsSubvolDefault) - (all nixos.tests.boot.bootBiosCdrom) + (all nixos.tests.boot.biosCdrom) (all nixos.tests.ipv6) (all nixos.tests.kde4) #(all nixos.tests.lightdm) diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index 6a1d330155e17..905d164588255 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -30,17 +30,17 @@ let ''; }; in { - bootBiosCdrom = makeBootTest "bios-cdrom" '' + biosCdrom = makeBootTest "bios-cdrom" '' cdrom => glob("${iso}/iso/*.iso") ''; - bootBiosUsb = makeBootTest "bios-usb" '' + biosUsb = makeBootTest "bios-usb" '' usb => glob("${iso}/iso/*.iso") ''; - bootUefiCdrom = makeBootTest "uefi-cdrom" '' + uefiCdrom = makeBootTest "uefi-cdrom" '' cdrom => glob("${iso}/iso/*.iso"), bios => '${pkgs.OVMF}/FV/OVMF.fd' ''; - bootUefiUsb = makeBootTest "uefi-usb" '' + uefiUsb = makeBootTest "uefi-usb" '' usb => glob("${iso}/iso/*.iso"), bios => '${pkgs.OVMF}/FV/OVMF.fd' ''; |