movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-16 22:49:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/test-driver: use an argument instead of the out env-var

Browse source
This commit is contained in:
Marijan Petričević 2022-01-07 15:45:30 +01:00
parent 1e643a3852
commit f9b5f9dba7
4 changed files with 38 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nixos/lib/test-driver/test_driver/driver.py
View file

@ -24,9 +24,11 @@ class Driver:
start_scripts: List[str],
vlans: List[int],
tests: str,
out_dir: Path,
keep_vm_state: bool = False,
):
self.tests = tests
self.out_dir = out_dir
tmp_dir = Path(os.environ.get("TMPDIR", tempfile.gettempdir()))
tmp_dir.mkdir(mode=0o700, exist_ok=True)
@ -46,7 +48,11 @@ class Driver:
keep_vm_state=keep_vm_state,
name=cmd.machine_name,
tmp_dir=tmp_dir,
<<<<<<< HEAD
callbacks=[self.check_polling_conditions],
=======
out_dir=self.out_dir,
>>>>>>> 68b2e235272 (nixos/test-driver: use an argument instead of the out env-var)
)
for cmd in cmd(start_scripts)
]
@ -154,6 +160,7 @@ class Driver:
return Machine(
tmp_dir=tmp_dir,
out_dir=self.out_dir,
start_command=cmd,
name=name,
keep_vm_state=args.get("keep_vm_state", False),