public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #72947 from tfc/boot-test-port-fix 

Boot test port fix
This commit is contained in:
worldofpeace 2019-11-07 17:32:43 +00:00 committed by GitHub
parent 5f6f75fcec 52ee1026b0
commit 6ed6d1af6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/lib/test-driver/test-driver.py
View File

@ -601,7 +601,7 @@ class Machine:
stdin=subprocess.DEVNULL, stdin=subprocess.DEVNULL,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, stderr=subprocess.STDOUT,
shell=False, shell=True,
cwd=self.state_dir, cwd=self.state_dir,
env=environment, env=environment,
) )
@ -610,7 +610,7 @@ class Machine:
def process_serial_output(): def process_serial_output():
for line in self.process.stdout: for line in self.process.stdout:
line = line.decode().replace("\r", "").rstrip() line = line.decode("unicode_escape").replace("\r", "").rstrip()
eprint("{} # {}".format(self.name, line)) eprint("{} # {}".format(self.name, line))
self.logger.enqueue({"msg": line, "machine": self.name}) self.logger.enqueue({"msg": line, "machine": self.name})