Mirrors/disko
2
0
Fork 0
mirror of https://github.com/nix-community/disko synced 2024-11-13 23:57:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #761 from nix-community/update_flake_lock_action

Browse source 
flake.lock: Update
This commit is contained in:
Jörg Thalheim 2024-11-08 11:14:24 +01:00 committed by GitHub
commit 5e40e02978
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1725194671, "lastModified": 1730958623,
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", "rev": "85f7e662eda4fa3a995556527c87b2524b691933",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
lib/tests.nix
View file

@ -54,6 +54,7 @@ let
, postDisko ? "" , postDisko ? ""
, testMode ? "module" # can be one of direct module cli , testMode ? "module" # can be one of direct module cli
, testBoot ? true # if we actually want to test booting or just create/mount , testBoot ? true # if we actually want to test booting or just create/mount
, enableOCR ? false
}: }:
let let
makeTest' = args: makeTest' = args:
@ -163,6 +164,8 @@ let
in in
makeTest' { makeTest' {
name = "disko-${name}"; name = "disko-${name}";
meta.timeout = 600; # 10 minutes
inherit enableOCR;
nodes.machine = { pkgs, ... }: { nodes.machine = { pkgs, ... }: {
imports = [ imports = [

10
tests/luks-interactive-login.nix
View file

@ -1,15 +1,17 @@
{ pkgs ? import <nixpkgs> { } {
, diskoLib ? pkgs.callPackage ../lib { } pkgs ? import <nixpkgs> { },
diskoLib ? pkgs.callPackage ../lib { },
}: }:
diskoLib.testLib.makeDiskoTest { diskoLib.testLib.makeDiskoTest {
inherit pkgs; inherit pkgs;
name = "luks-interactive-login"; name = "luks-interactive-login";
disko-config = ../example/luks-interactive-login.nix; disko-config = ../example/luks-interactive-login.nix;
enableOCR = true;
extraTestScript = '' extraTestScript = ''
machine.succeed("cryptsetup isLuks /dev/vda2"); machine.succeed("cryptsetup isLuks /dev/vda2");
''; '';
bootCommands = '' bootCommands = ''
machine.wait_for_console_text("vda") machine.wait_for_text("[Pp]assphrase for")
machine.send_console("secretsecret\n") machine.send_chars("secretsecret\n")
''; '';
} }