summary refs log tree commit diff
path: root/nixos/lib
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-05-01 01:15:39 +0200
committerFlorian Klink <flokli@flokli.de>2020-05-01 01:22:42 +0200
commit3cdd558a6f785fb3a934c7c1820b3576c9e8b5b6 (patch)
tree539186e274ae613d7e9916a8aef4855de56b9733 /nixos/lib
parentb139bc0d87cb4f13ab5a156bf1b6fb941f09488b (diff)
downloadnixpkgs-3cdd558a6f785fb3a934c7c1820b3576c9e8b5b6.tar
nixpkgs-3cdd558a6f785fb3a934c7c1820b3576c9e8b5b6.tar.gz
nixpkgs-3cdd558a6f785fb3a934c7c1820b3576c9e8b5b6.tar.bz2
nixpkgs-3cdd558a6f785fb3a934c7c1820b3576c9e8b5b6.tar.lz
nixpkgs-3cdd558a6f785fb3a934c7c1820b3576c9e8b5b6.tar.xz
nixpkgs-3cdd558a6f785fb3a934c7c1820b3576c9e8b5b6.tar.zst
nixpkgs-3cdd558a6f785fb3a934c7c1820b3576c9e8b5b6.zip
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
Diffstat (limited to 'nixos/lib')
-rw-r--r--nixos/lib/test-driver/test-driver.py20
1 files changed, 0 insertions, 20 deletions
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index 4f145507a8b..d96600b3c99 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -85,8 +85,6 @@ CHAR_TO_KEY = {
 }
 
 # Forward references
-nr_tests: int
-failed_tests: list
 log: "Logger"
 machines: "List[Machine]"
 
@@ -882,25 +880,10 @@ def run_tests() -> None:
         if machine.is_up():
             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
 def subtest(name: str) -> Iterator[None]:
-    global nr_tests
-    global failed_tests
-
     with log.nested(name):
-        nr_tests += 1
         try:
             yield
             return True
@@ -926,9 +909,6 @@ if __name__ == "__main__":
     ]
     exec("\n".join(machine_eval))
 
-    nr_tests = 0
-    failed_tests = []
-
     @atexit.register
     def clean_up() -> None:
         with log.nested("cleaning up"):