diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-03 21:29:24 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-03 21:29:24 -0800 |
| commit | 9a16965c751b90e2674ba8bb8ec25582cf631f29 (patch) | |
| tree | cca818753e0db7af49db0e3e33dbfd4d86f9dbf7 /nixos/lib | |
| parent | 3b8270ac54b9e1892e5ed465ac01a61cd575863f (diff) | |
| parent | 2d666e4bf69a81a731f87a06aa54e3dd1dde217d (diff) | |
| download | nixlib-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar nixlib-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar.gz nixlib-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar.bz2 nixlib-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar.lz nixlib-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar.xz nixlib-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar.zst nixlib-9a16965c751b90e2674ba8bb8ec25582cf631f29.zip | |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: pkgs/development/python-modules/awesomeversion/default.nix pkgs/development/python-modules/md2gemini/default.nix pkgs/development/python-modules/mill-local/default.nix pkgs/development/python-modules/pyatv/default.nix pkgs/development/python-modules/pyezviz/default.nix pkgs/development/python-modules/pyinsteon/default.nix pkgs/development/python-modules/pylitterbot/default.nix pkgs/development/python-modules/pynuki/default.nix pkgs/development/python-modules/pypck/default.nix pkgs/development/python-modules/types-requests/default.nix pkgs/top-level/aliases.nix
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/test-driver/test_driver/machine.py | 4 |
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()], ) |