diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2020-08-25 08:08:52 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2020-08-25 09:36:37 +0100 |
commit | c1667f85bb9ab44870d159e779bfb0a139f6f537 (patch) | |
tree | dfcfca980811cd5b98774ab6e9ba69b09b7f4899 /nixos/lib/test-driver | |
parent | c8189b52b5550fef15283d2b7958114e40bc6968 (diff) | |
download | nixlib-c1667f85bb9ab44870d159e779bfb0a139f6f537.tar nixlib-c1667f85bb9ab44870d159e779bfb0a139f6f537.tar.gz nixlib-c1667f85bb9ab44870d159e779bfb0a139f6f537.tar.bz2 nixlib-c1667f85bb9ab44870d159e779bfb0a139f6f537.tar.lz nixlib-c1667f85bb9ab44870d159e779bfb0a139f6f537.tar.xz nixlib-c1667f85bb9ab44870d159e779bfb0a139f6f537.tar.zst nixlib-c1667f85bb9ab44870d159e779bfb0a139f6f537.zip |
nixos/test-driver: introduce main method
This way we not accidentally use introduce/use global variables. Also it explictly mark the code for the mypy type checker.
Diffstat (limited to 'nixos/lib/test-driver')
-rw-r--r-- | nixos/lib/test-driver/test-driver.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index f4e2bb6100f9..b5e8b398d0b4 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -922,7 +922,8 @@ def subtest(name: str) -> Iterator[None]: return False -if __name__ == "__main__": +def main() -> None: + global machines arg_parser = argparse.ArgumentParser() arg_parser.add_argument( "-K", @@ -944,7 +945,8 @@ if __name__ == "__main__": if not cli_args.keep_vm_state: machine.cleanup_statedir() machine_eval = [ - "{0} = machines[{1}]".format(m.name, idx) for idx, m in enumerate(machines) + "global {0}; {0} = machines[{1}]".format(m.name, idx) + for idx, m in enumerate(machines) ] exec("\n".join(machine_eval)) @@ -964,3 +966,7 @@ if __name__ == "__main__": run_tests() toc = time.time() print("test script finished in {:.2f}s".format(toc - tic)) + + +if __name__ == "__main__": + main() |