tests: fix remaining type errors

Author: kkysen

tests/__init__.py

@@ -11,7 +11,7 @@
 
 class Test(object):
 
-    STAGES: dict = {
+    STAGES: dict[str, list[str]] = {
         "autogen": ["autogen.sh"],
         "configure": ["configure.sh"],
         "make": ["make.sh", "cmake.sh"],
@@ -39,12 +39,14 @@ def print_log_tail_on_fail(script_path):
             if os.path.isfile(logfile):
                 grep_cmd = ['grep', '-i', '-A', '20', '-E', 'panicked|error', logfile]
                 grep = subprocess.Popen(grep_cmd, stdout=subprocess.PIPE)
+                assert grep.stdout is not None
                 for line in grep.stdout:
                     print(line.decode().rstrip())
 
                 # fall back to tail if grep didn't find anything
                 if grep.returncode != 0:
                     tail = subprocess.Popen(['tail', '-n', '20', logfile], stdout=subprocess.PIPE)
+                    assert tail.stdout is not None
                     for line in tail.stdout:
                         print(line.decode().rstrip())
             else:
@@ -81,6 +83,8 @@ def print_log_tail_on_fail(script_path):
                 nc=Colors.NO_COLOR,
                 stage=stage,
                 script=relpath)
+        else:
+            line = ""
 
         # if we already have `compile_commands.json`, skip the build stages
         if stage in ["autogen", "configure", "make"]:
@@ -181,7 +185,7 @@ def run(self, conf: Config) -> bool:
         self.ensure_submodule_checkout()
 
         stages = Test.STAGES.keys()
-        if conf.stages:
+        if conf.stages is not None:
             # Check that all stages are valid
             for stage in conf.stages:
                 if stage not in Test.STAGES:

tests/util.py

@@ -4,12 +4,14 @@
 import json
 import errno
 
-from typing import List, Iterable
+from typing import Any, List, Iterable, Never, Sequence
 
 CONF_YML: str = "conf.yml"
 
 
 class Config(object):
+    stages: list[str] | None
+
     def __init__(self, args):
         self.verbose = args.verbose
         self.projects = args.projects  # projects filter
@@ -18,8 +20,8 @@ def __init__(self, args):
         self.project_dirs = find_project_dirs(self)
         self.project_conf = {cf: get_yaml(cf) for cf in get_conf_files(self)}
 
-    def try_get_conf_for(self, conf_file, *keys: List[str]):
-        def lookup(yaml, keys: List[str]):
+    def try_get_conf_for(self, conf_file, *keys: str):
+        def lookup(yaml, keys: Sequence[str]):
             if not keys:
                 return None
             head, *tail = keys
@@ -44,7 +46,7 @@ class Colors(object):
     NO_COLOR = '\033[0m'
 
 
-def die(emsg: str, status: int=errno.EINVAL):
+def die(emsg: str, status: int=errno.EINVAL) -> Never:
     (red, nc) = (Colors.FAIL, Colors.NO_COLOR)
     print(f"{red}error:{nc} {emsg}", file=sys.stderr)
     exit(status)
@@ -97,15 +99,15 @@ def find_project_dirs(conf: Config) -> List[str]:
     return [os.path.join(script_dir, s) for s in subdirs]
 
 
-def get_yaml(file: str) -> dict:
+def get_yaml(file: str) -> dict[str, Any]:
     with open(file, 'r') as stream:
         try:
             return yaml.safe_load(stream)
         except yaml.YAMLError as exc:
             die(str(exc))
 
 
-def check_compile_commands(compile_commands_path: str) -> (bool, str):
+def check_compile_commands(compile_commands_path: str) -> tuple[bool, str]:
     """
     Return True iff compile_commands_path points to a valid
     compile_commands.json and all referenced source files exist.