about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorCosima Neidahl <opna2608@protonmail.com>2024-03-11 19:04:18 +0100
committerGitHub <noreply@github.com>2024-03-11 19:04:18 +0100
commita44e09da5e15453dbfb0eda4d0e3050e14cf4bb1 (patch)
treeb1e5dd94944717799115a31350f1ef4f6d21c780 /nixos
parent1809887dbe51fcf061c4244e0475d75d991f7547 (diff)
parenta49c3d26899b46ed9b5cdd401dc202f7c9ba8f3b (diff)
downloadnixlib-a44e09da5e15453dbfb0eda4d0e3050e14cf4bb1.tar
nixlib-a44e09da5e15453dbfb0eda4d0e3050e14cf4bb1.tar.gz
nixlib-a44e09da5e15453dbfb0eda4d0e3050e14cf4bb1.tar.bz2
nixlib-a44e09da5e15453dbfb0eda4d0e3050e14cf4bb1.tar.lz
nixlib-a44e09da5e15453dbfb0eda4d0e3050e14cf4bb1.tar.xz
nixlib-a44e09da5e15453dbfb0eda4d0e3050e14cf4bb1.tar.zst
nixlib-a44e09da5e15453dbfb0eda4d0e3050e14cf4bb1.zip
Merge pull request #294555 from r-ryantm/auto-update/miriway
miriway: unstable-2024-02-14 -> unstable-2024-03-06
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/miriway.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/miriway.nix b/nixos/tests/miriway.nix
index a0987d9fc41b..24e6ec6367cd 100644
--- a/nixos/tests/miriway.nix
+++ b/nixos/tests/miriway.nix
@@ -100,7 +100,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
     # Test Wayland
     # We let Miriway start the first terminal, as we might get stuck if it's not ready to process the first keybind
     # machine.send_key("ctrl-alt-t")
-    machine.wait_for_text("alice@machine")
+    machine.wait_for_text(r"(alice|machine)")
     machine.send_chars("test-wayland\n")
     machine.wait_for_file("/tmp/test-wayland-exit-ok")
     machine.copy_from_vm("/tmp/test-wayland.out")
@@ -112,7 +112,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
 
     # Test XWayland
     machine.send_key("ctrl-alt-a")
-    machine.wait_for_text("alice@machine")
+    machine.wait_for_text(r"(alice|machine)")
     machine.send_chars("test-x11\n")
     machine.wait_for_file("/tmp/test-x11-exit-ok")
     machine.copy_from_vm("/tmp/test-x11.out")