about summary refs log tree commit diff
path: root/nixos/lib/test-driver
diff options
context:
space:
mode:
authorFélix Baylac-Jacqué <felix@alternativebit.fr>2020-09-11 10:47:03 +0200
committerFélix Baylac-Jacqué <felix@alternativebit.fr>2020-09-11 10:47:03 +0200
commite571b315e22bb5a09e86f8b76a2473b9a65fbcd0 (patch)
tree40a1b9aec58187236f9c079c055583045ed61281 /nixos/lib/test-driver
parenta4754caab79dfccb19d4609c12eea60fd8185737 (diff)
test-driver.py: defaulting keepVmState in Machine init
ecb73fd5557d6d438aa7c155e5b1aad89373c6ae introduced a new keepVmState
CLI flag for test-driver.py. This CLI flags gets forwarded to the
Machine class through create_machine.

It created a regression for the boot tests where __main__ end up not
being evaluated. See
https://github.com/NixOS/nixpkgs/pull/97346#issuecomment-690951837 for
bug report.

Defaulting keepVmState to false when __main__ ends up not being
evaluated.
Diffstat (limited to 'nixos/lib/test-driver')
-rw-r--r--nixos/lib/test-driver/test-driver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index 5d3e632fac2c8..156392ad1e320 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -228,7 +228,7 @@ class Machine:
             return path
 
         self.state_dir = os.path.join(tmp_dir, f"vm-state-{self.name}")
-        if not args["keepVmState"]:
+        if not args.get("keepVmState", False):
             self.cleanup_statedir()
         os.makedirs(self.state_dir, mode=0o700, exist_ok=True)
         self.shared_dir = create_dir("shared-xchg")