nixos/test: Fix child environment of python driver

2019-11-19 12:59:14 +01:00 · 2019-11-19 12:59:14 +01:00 · 67e2042861
commit 67e2042861
parent 783184f772
1 changed files with 9 additions and 6 deletions
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@ -606,12 +606,15 @@ class Machine:
            + os.environ.get("QEMU_OPTS", "")
        )

-        environment = {
-            "QEMU_OPTS": qemu_options,
+        environment = dict(os.environ)
+        environment.update(
+            {
+                "TMPDIR": self.state_dir,
                "SHARED_DIR": self.shared_dir,
                "USE_TMPDIR": "1",
+                "QEMU_OPTS": qemu_options,
            }
-        environment.update(dict(os.environ))
+        )

        self.process = subprocess.Popen(
            self.script,