Merge #154

154: tests: adjust wait_for_text calls to work for systemd-initrd or old stage-1 r=Mic92 a=lilyinstarlight Co-authored-by: Lily Foster <[email protected]>
nix-community · Feb 21, 2023 · 07f9727 · 07f9727
2 parents 1cfb46e + 00a2e2c
commit 07f9727
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/tests/cli.nix b/tests/cli.nix
@@ -20,7 +20,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
@@ -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/luks-lvm.nix b/tests/luks-lvm.nix
@@ -10,7 +10,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
@@ -20,7 +20,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
@@ -13,7 +13,7 @@ makeDiskoTest {
   '';
   enableOCR = true;
   bootCommands = ''
-    machine.wait_for_text("passphrase for")
+    machine.wait_for_text("(?:passphrase|key) for")
     machine.send_chars("secretsecret\n")
   '';
   extraTestScript = ''