about summary refs log tree commit diff
path: root/nixos/lib
diff options
context:
space:
mode:
authorLassulus <github@lassul.us>2022-02-02 18:50:46 +0100
committerGitHub <noreply@github.com>2022-02-02 18:50:46 +0100
commitb80607af676b90f844d2a261dcdfed12f5b79155 (patch)
tree801f5f709d3b155fc6eaad2aae42fb93e732f5ef /nixos/lib
parent3aff2d66f60559a149769d7219e78f75e41810e3 (diff)
parentf472e52aa6a718090f433f60b2f6c6748b981d6e (diff)
downloadnixlib-b80607af676b90f844d2a261dcdfed12f5b79155.tar
nixlib-b80607af676b90f844d2a261dcdfed12f5b79155.tar.gz
nixlib-b80607af676b90f844d2a261dcdfed12f5b79155.tar.bz2
nixlib-b80607af676b90f844d2a261dcdfed12f5b79155.tar.lz
nixlib-b80607af676b90f844d2a261dcdfed12f5b79155.tar.xz
nixlib-b80607af676b90f844d2a261dcdfed12f5b79155.tar.zst
nixlib-b80607af676b90f844d2a261dcdfed12f5b79155.zip
Merge pull request #154804 from Mic92/tests-prompt
nixos/tests: add prompt to shell_interact()
Diffstat (limited to 'nixos/lib')
-rw-r--r--nixos/lib/test-driver/test_driver/machine.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py
index a41c419ebe6a..b730c4b44d7f 100644
--- a/nixos/lib/test-driver/test_driver/machine.py
+++ b/nixos/lib/test-driver/test_driver/machine.py
@@ -543,11 +543,11 @@ class Machine:
 
         Should only be used during test development, not in the production test."""
         self.connect()
-        self.log("Terminal is ready (there is no prompt):")
+        self.log("Terminal is ready (there is no initial prompt):")
 
         assert self.shell
         subprocess.run(
-            ["socat", "READLINE", f"FD:{self.shell.fileno()}"],
+            ["socat", "READLINE,prompt=$ ", f"FD:{self.shell.fileno()}"],
             pass_fds=[self.shell.fileno()],
         )