e1ec5ac · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

nixos/test-driver: start interactive mode if `testScript` is empty

This is relevant for `nixos-build-vms(8)` which doesn't have a test-script. In that case it's more intuitive to directly go into the interactive mode which is IMHO more intuitive.

commite1ec5acd3137d3af247f9a938d9cc086d8111377 authorMaximilian Bosch <maximilian@mbosch.me> dateThu 12 Aug 2021, 23:01 (5 years ago) parent260d9cc

1 file changed+4−2

compare with master

unifiedsplit

nixos/lib/test-driver/test-driver.py+4−2

nixos/lib/test-driver/test-driver.py+4−2

@@ -1029,10 +1029,11 @@ if __name__ == "__main__":

10291029

10301030 args = arg_parser.parse_args()

10311031 global test_script

1032+ testscript = pathlib.Path(args.testscript).read_text()

10321033

10331034 def test_script() -> None:

10341035 with log.nested("running the VM test script"):

1035− exec(pathlib.Path(args.testscript).read_text(), globals())

1036+ exec(testscript, globals())

10361037

10371038 log = Logger()

10381039

@@ -1061,7 +1062,8 @@ if __name__ == "__main__":

10611062 process.terminate()

10621063 log.close()

10631064

1065+ interactive = args.interactive or (not bool(testscript))

10641066 tic = time.time()

1065− run_tests(args.interactive)

1067+ run_tests(interactive)

10661068 toc = time.time()

10671069 print("test script finished in {:.2f}s".format(toc - tic))