movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-24 18:16:21 +03:00
Code Activity

introduce writeable_dir argparse type

Browse source
This commit is contained in:
Marijan Petričević 2022-01-25 10:21:33 +01:00
parent 7765670c8a
commit e17fcbc966
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
nixos/lib/test-driver/test_driver/__init__.py
View file

@ -33,18 +33,20 @@ class EnvDefault(argparse.Action):
setattr(namespace, self.dest, values) setattr(namespace, self.dest, values)
def raise_if_not_writeable_dir(path: Path) -> None: def writeable_dir(arg: str) -> Path:
"""Raises an ArgumentTypeError if the given path isn't a writeable directory """Raises an ArgumentTypeError if the given argument isn't a writeable directory
Note: We want to fail as early as possible if a directory isn't writeable, Note: We want to fail as early as possible if a directory isn't writeable,
since an executed nixos-test could fail (very late) because of the test-driver since an executed nixos-test could fail (very late) because of the test-driver
writing in a directory without proper permissions. writing in a directory without proper permissions.
""" """
path = Path(arg)
if not path.is_dir(): if not path.is_dir():
raise argparse.ArgumentTypeError("{0} is not a directory".format(path)) raise argparse.ArgumentTypeError("{0} is not a directory".format(path))
if not os.access(path, os.W_OK): if not os.access(path, os.W_OK):
raise argparse.ArgumentTypeError( raise argparse.ArgumentTypeError(
"{0} is not a writeable directory".format(path) "{0} is not a writeable directory".format(path)
) )
return path
def main() -> None: def main() -> None:
@ -83,7 +85,7 @@ def main() -> None:
help="""The path to the directory where outputs copied from the VM will be placed. help="""The path to the directory where outputs copied from the VM will be placed.
By e.g. Machine.copy_from_vm or Machine.screenshot""", By e.g. Machine.copy_from_vm or Machine.screenshot""",
default=Path.cwd(), default=Path.cwd(),
type=Path, type=writeable_dir,
) )
arg_parser.add_argument( arg_parser.add_argument(
"testscript", "testscript",
@ -95,8 +97,6 @@ def main() -> None:
args = arg_parser.parse_args() args = arg_parser.parse_args()
raise_if_not_writeable_dir(args.output_directory)
if not args.keep_vm_state: if not args.keep_vm_state:
rootlog.info("Machine state will be reset. To keep it, pass --keep-vm-state") rootlog.info("Machine state will be reset. To keep it, pass --keep-vm-state")