From 00a2e2c4386e7b98a149f21b13debb1d80cc9315 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Tue, 21 Feb 2023 11:33:21 -0500 Subject: [PATCH] tests: adjust wait_for_text calls to work for systemd-initrd or old stage-1 --- tests/cli.nix | 2 +- tests/complex.nix | 2 +- tests/luks-lvm.nix | 2 +- tests/module.nix | 2 +- tests/zfs.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/cli.nix b/tests/cli.nix index 0c2bf29..31905bf 100644 --- a/tests/cli.nix +++ b/tests/cli.nix @@ -19,7 +19,7 @@ makeDiskoTest { ''; enableOCR = true; bootCommands = '' - machine.wait_for_text("Passphrase for") + machine.wait_for_text("[Pp]assphrase for") machine.send_chars("secretsecret\n") ''; extraConfig = { diff --git a/tests/complex.nix b/tests/complex.nix index 6209338..5c8cd0c 100644 --- a/tests/complex.nix +++ b/tests/complex.nix @@ -18,7 +18,7 @@ makeDiskoTest { ''; enableOCR = true; bootCommands = '' - machine.wait_for_text("Passphrase for") + machine.wait_for_text("[Pp]assphrase for") machine.send_chars("secretsecret\n") ''; extraConfig = { diff --git a/tests/luks-lvm.nix b/tests/luks-lvm.nix index 4f35e5d..473e15c 100644 --- a/tests/luks-lvm.nix +++ b/tests/luks-lvm.nix @@ -9,7 +9,7 @@ makeDiskoTest { ''; enableOCR = true; bootCommands = '' - machine.wait_for_text("Passphrase for") + machine.wait_for_text("[Pp]assphrase for") machine.send_chars("secretsecret\n") ''; } diff --git a/tests/module.nix b/tests/module.nix index 2a6342f..b8f8a36 100644 --- a/tests/module.nix +++ b/tests/module.nix @@ -19,7 +19,7 @@ makeDiskoTest { ''; enableOCR = true; bootCommands = '' - machine.wait_for_text("Passphrase for") + machine.wait_for_text("[Pp]assphrase for") machine.send_chars("secretsecret\n") ''; extraConfig = { diff --git a/tests/zfs.nix b/tests/zfs.nix index ce60789..b827090 100644 --- a/tests/zfs.nix +++ b/tests/zfs.nix @@ -12,7 +12,7 @@ makeDiskoTest { ''; enableOCR = true; bootCommands = '' - machine.wait_for_text("passphrase for") + machine.wait_for_text("(?:passphrase|key) for") machine.send_chars("secretsecret\n") ''; extraTestScript = ''