Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test-driver.py: fix VM state directory deletion #97346

Merged
merged 1 commit into from Sep 10, 2020
Merged

test-driver.py: fix VM state directory deletion #97346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 12 additions & 9 deletions nixos/lib/test-driver/test-driver.py
View file
Open in desktop
Expand Up @@ -217,7 +217,7 @@ def __init__(self, args: Dict[str, Any]) -> None:
match = re.search("run-(.+)-vm$", cmd)
if match:
self.name = match.group(1)

self.logger = args["log"]
self.script = args.get("startCommand", self.create_startcommand(args))

tmp_dir = os.environ.get("TMPDIR", tempfile.gettempdir())
Expand All @@ -227,15 +227,17 @@ def create_dir(name: str) -> str:
os.makedirs(path, mode=0o700, exist_ok=True)
return path

self.state_dir = create_dir("vm-state-{}".format(self.name))
self.state_dir = os.path.join(tmp_dir, f"vm-state-{self.name}")
if not args["keepVmState"]:
self.cleanup_statedir()
os.makedirs(self.state_dir, mode=0o700, exist_ok=True)
self.shared_dir = create_dir("shared-xchg")

self.booted = False
self.connected = False
self.pid: Optional[int] = None
self.socket = None
self.monitor: Optional[socket.socket] = None
self.logger: Logger = args["log"]
self.allow_reboot = args.get("allowReboot", False)

@staticmethod
Expand Down Expand Up @@ -780,9 +782,10 @@ def process_serial_output() -> None:
self.log("QEMU running (pid {})".format(self.pid))

def cleanup_statedir(self) -> None:
self.log("delete the VM state directory")
if os.path.isfile(self.state_dir):
if os.path.isdir(self.state_dir):
shutil.rmtree(self.state_dir)
self.logger.log(f"deleting VM state directory {self.state_dir}")
self.logger.log("if you want to keep the VM state, pass --keep-vm-state")

def shutdown(self) -> None:
if not self.booted:
Expand Down Expand Up @@ -940,10 +943,10 @@ def subtest(name: str) -> Iterator[None]:
for nr, vde_socket, _, _ in vde_sockets:
os.environ["QEMU_VDE_SOCKET_{}".format(nr)] = vde_socket

machines = [create_machine({"startCommand": s}) for s in vm_scripts]
for machine in machines:
if not cli_args.keep_vm_state:
machine.cleanup_statedir()
machines = [
create_machine({"startCommand": s, "keepVmState": cli_args.keep_vm_state})
for s in vm_scripts
]
machine_eval = [
"{0} = machines[{1}]".format(m.name, idx) for idx, m in enumerate(machines)
]
Expand Down