alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/test-driver: replace termlib with socat

Browse source 
telnetlib does not handle unicode, which is annoying when using systemctl.
Also this gives us a nice readline with history.
This commit is contained in:
Jörg Thalheim 2021-06-22 08:51:39 +02:00
parent a95eebd1cd
commit 48aec70ea1
No known key found for this signature in database
GPG key ID: B3F5D81B0C6967C4
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nixos/lib/test-driver/test-driver.py
View file

@ -462,9 +462,10 @@ class Machine:
Should only be used during test development, not in the production test.""" Should only be used during test development, not in the production test."""
self.connect() self.connect()
self.log("Terminal is ready (there is no prompt):") self.log("Terminal is ready (there is no prompt):")
telnet = telnetlib.Telnet() subprocess.run(
telnet.sock = self.shell # type: ignore ["socat", "READLINE", f"FD:{self.shell.fileno()}"],
telnet.interact() pass_fds=[self.shell.fileno()],
)
def succeed(self, *commands: str) -> str: def succeed(self, *commands: str) -> str:
"""Execute each command and check that it succeeds.""" """Execute each command and check that it succeeds."""

2
nixos/lib/testing-python.nix
View file

@ -64,7 +64,7 @@ rec {
wrapProgram $out/bin/nixos-test-driver \ wrapProgram $out/bin/nixos-test-driver \
--argv0 ${name} \ --argv0 ${name} \
--prefix PATH : "${lib.makeBinPath [ qemu_pkg vde2 netpbm coreutils ]}" \ --prefix PATH : "${lib.makeBinPath [ qemu_pkg vde2 netpbm coreutils socat ]}" \
${lib.optionalString enableOCR ${lib.optionalString enableOCR
"--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \ "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \