public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixosTests: drop nr_tests and failed_tests variables 

With the tests now bailing out early on a failing subtest, we don't need
to keep a list of failed tests, or the number of total tests
This commit is contained in:
Florian Klink 2020-05-01 01:15:39 +02:00
parent b139bc0d87
commit 3cdd558a6f
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nixos/lib/test-driver/test-driver.py
View File

@ -85,8 +85,6 @@ CHAR_TO_KEY = {
} }
# Forward references # Forward references
nr_tests: int
failed_tests: list
log: "Logger" log: "Logger"
machines: "List[Machine]" machines: "List[Machine]"
@ -882,25 +880,10 @@ def run_tests() -> None:
if machine.is_up(): if machine.is_up():
machine.execute("sync") machine.execute("sync")
if nr_tests != 0:
nr_succeeded = nr_tests - len(failed_tests)
eprint("{} out of {} tests succeeded".format(nr_succeeded, nr_tests))
if len(failed_tests) > 0:
eprint(
"The following tests have failed:\n - {}".format(
"\n - ".join(failed_tests)
)
)
sys.exit(1)
@contextmanager @contextmanager
def subtest(name: str) -> Iterator[None]: def subtest(name: str) -> Iterator[None]:
global nr_tests
global failed_tests
with log.nested(name): with log.nested(name):
nr_tests += 1
try: try:
yield yield
return True return True
@ -926,9 +909,6 @@ if __name__ == "__main__":
] ]
exec("\n".join(machine_eval)) exec("\n".join(machine_eval))
nr_tests = 0
failed_tests = []
@atexit.register @atexit.register
def clean_up() -> None: def clean_up() -> None:
with log.nested("cleaning up"): with log.nested("cleaning up"):