about summary refs log tree commit diff
path: root/nixos/lib
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-11-07 17:32:43 +0000
committerGitHub <noreply@github.com>2019-11-07 17:32:43 +0000
commit6ed6d1af6a02ec8307994e3c0bb247f1755d35b8 (patch)
treeaeffdc48c04af94e26c21f90d945a49d94f9c33d /nixos/lib
parent5f6f75fcec8aecc6abc26b7b5deb3936a0d5703e (diff)
parent52ee1026b01bd875ca5a95f9fe1193dcbd742364 (diff)
downloadnixlib-6ed6d1af6a02ec8307994e3c0bb247f1755d35b8.tar
nixlib-6ed6d1af6a02ec8307994e3c0bb247f1755d35b8.tar.gz
nixlib-6ed6d1af6a02ec8307994e3c0bb247f1755d35b8.tar.bz2
nixlib-6ed6d1af6a02ec8307994e3c0bb247f1755d35b8.tar.lz
nixlib-6ed6d1af6a02ec8307994e3c0bb247f1755d35b8.tar.xz
nixlib-6ed6d1af6a02ec8307994e3c0bb247f1755d35b8.tar.zst
nixlib-6ed6d1af6a02ec8307994e3c0bb247f1755d35b8.zip
Merge pull request #72947 from tfc/boot-test-port-fix
Boot test port fix
Diffstat (limited to 'nixos/lib')
-rw-r--r--nixos/lib/test-driver/test-driver.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index cec9cdf7528b..bd52233964b7 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -601,7 +601,7 @@ class Machine:
             stdin=subprocess.DEVNULL,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
-            shell=False,
+            shell=True,
             cwd=self.state_dir,
             env=environment,
         )
@@ -610,7 +610,7 @@ class Machine:
 
         def process_serial_output():
             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))
                 self.logger.enqueue({"msg": line, "machine": self.name})