tests/integration: uvx ruff format

kkysen · kkysen · commit 47c2fd56e18a · 2025-12-08T05:00:04.000-08:00
diff --git a/tests/integration/test.py b/tests/integration/test.py
@@ -9,22 +9,44 @@
 
 
 def get_args():
-    parser = argparse.ArgumentParser(description='C2Rust testsuite.')
-    parser.add_argument('--verbose', dest='verbose', action='store_true',
-                        default=False,
-                        help='Enable verbose output')
-    parser.add_argument('--stages', dest='stages', action='store',
-                        nargs='*', type=str, default=None, choices=tests.Test.STAGES,
-                        help='Only test specified stage(s)')
-    parser.add_argument('--print-requirements', metavar='PLATFORM',
-                        dest='requirements', choices=['ubuntu'],
-                        action='store', type=str, default=None,
-                        help='Print requirements for platform and exit')
-    parser.add_argument('--ignore-requirements',
-                        action='store_true',
-                        help='Ignore test requirements')
-    parser.add_argument('projects', metavar='project', type=str, nargs='*',
-                        help='Project to test (defaults to all projects if none specified)')
+    parser = argparse.ArgumentParser(description="C2Rust testsuite.")
+    parser.add_argument(
+        "--verbose",
+        dest="verbose",
+        action="store_true",
+        default=False,
+        help="Enable verbose output",
+    )
+    parser.add_argument(
+        "--stages",
+        dest="stages",
+        action="store",
+        nargs="*",
+        type=str,
+        default=None,
+        choices=tests.Test.STAGES,
+        help="Only test specified stage(s)",
+    )
+    parser.add_argument(
+        "--print-requirements",
+        metavar="PLATFORM",
+        dest="requirements",
+        choices=["ubuntu"],
+        action="store",
+        type=str,
+        default=None,
+        help="Print requirements for platform and exit",
+    )
+    parser.add_argument(
+        "--ignore-requirements", action="store_true", help="Ignore test requirements"
+    )
+    parser.add_argument(
+        "projects",
+        metavar="project",
+        type=str,
+        nargs="*",
+        help="Project to test (defaults to all projects if none specified)",
+    )
     return parser.parse_args()
 
 
diff --git a/tests/integration/tests/__init__.py b/tests/integration/tests/__init__.py
@@ -1,4 +1,3 @@
-
 from concurrent.futures import ThreadPoolExecutor
 from dataclasses import dataclass
 from datetime import timedelta
@@ -14,7 +13,6 @@
 
 
 class Test(object):
-
     STAGES: dict[str, list[str]] = {
         "autogen": ["autogen.sh"],
         "configure": ["configure.sh"],
@@ -23,16 +21,22 @@ class Test(object):
         "cargo.transpile": ["cargo.transpile.gen.sh", "cargo.transpile.sh"],
         "refactor": ["refactor.gen.sh", "refactor.sh"],
         "cargo.refactor": ["cargo.refactor.gen.sh", "cargo.refactor.sh"],
-        "check": ["check.sh", "test.sh"]
+        "check": ["check.sh", "test.sh"],
     }
 
     def __init__(self, directory: Path, generated_scripts: set[Path]):
         # We only want scripts that have been generated by us now,
         # but non `*.gen*` scripts we can search for.
-        non_gen_script_paths = { f for f in directory.iterdir() if f.suffix == ".sh" and ".gen" not in f.suffixes }
-        gen_script_paths = { path for path in generated_scripts if path.is_relative_to(directory) }
+        non_gen_script_paths = {
+            f
+            for f in directory.iterdir()
+            if f.suffix == ".sh" and ".gen" not in f.suffixes
+        }
+        gen_script_paths = {
+            path for path in generated_scripts if path.is_relative_to(directory)
+        }
         script_paths = non_gen_script_paths | gen_script_paths
-        self.scripts = { str(script.relative_to(directory)) for script in script_paths }
+        self.scripts = {str(script.relative_to(directory)) for script in script_paths}
         self.dir = str(directory)
         self.conf_file = str(directory / CONF_YML)
         self.name = directory.name
@@ -45,41 +49,43 @@ def run_script(self, stage, script, verbose=False, xfail=False) -> bool:
         def print_log_tail_on_fail(script_path):
             logfile = f"{script_path}.log"
             if os.path.isfile(logfile):
-                grep_cmd = ['grep', '-i', '-A', '20', '-E', 'panicked|error', 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)
+                    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:
-                print("{color}Missing log file: {logf}{nocolor}".format(
-                    color=Colors.WARNING,
-                    logf=logfile,
-                    nocolor=Colors.NO_COLOR)
+                print(
+                    "{color}Missing log file: {logf}{nocolor}".format(
+                        color=Colors.WARNING, logf=logfile, nocolor=Colors.NO_COLOR
+                    )
                 )
 
         script_path = os.path.join(self.dir, script)
 
         if not os.path.isfile(script_path):
-            print("{color}Missing script: {script}{nocolor}".format(
-                    color=Colors.FAIL,
-                    script=script_path,
-                    nocolor=Colors.NO_COLOR)
+            print(
+                "{color}Missing script: {script}{nocolor}".format(
+                    color=Colors.FAIL, script=script_path, nocolor=Colors.NO_COLOR
                 )
+            )
             return False
 
         if not os.access(script_path, os.X_OK):
-            print("{color}Script is not executable: {script}{nocolor}".format(
-                    color=Colors.FAIL,
-                    script=script_path,
-                    nocolor=Colors.NO_COLOR)
+            print(
+                "{color}Script is not executable: {script}{nocolor}".format(
+                    color=Colors.FAIL, script=script_path, nocolor=Colors.NO_COLOR
                 )
+            )
             return False
 
         if not verbose:
@@ -89,7 +95,8 @@ def print_log_tail_on_fail(script_path):
                 name=self.name,
                 nc=Colors.NO_COLOR,
                 stage=stage,
-                script=relpath)
+                script=relpath,
+            )
         else:
             line = ""
 
@@ -192,7 +199,9 @@ def run(self, conf: Config) -> bool:
                     requested_stages = ", ".join(conf.stages)
                     stages = ", ".join(Test.STAGES.keys())
                     y, nc = Colors.WARNING, Colors.NO_COLOR
-                    die(f"invalid stages: {y}{requested_stages}{nc}. valid stages: {stages}")
+                    die(
+                        f"invalid stages: {y}{requested_stages}{nc}. valid stages: {stages}"
+                    )
 
             stages = conf.stages
 
@@ -234,5 +243,5 @@ def run(test: Test) -> TestResult:
     for result in results:
         print(f"{result.test.name} took {result.time}")
     if not all(result.passed for result in results):
-        print(f"projects failed: {" ".join(result.test.name for result in results)}")
+        print(f"projects failed: {' '.join(result.test.name for result in results)}")
         exit(1)
diff --git a/tests/integration/tests/hostenv.py b/tests/integration/tests/hostenv.py
@@ -20,6 +20,7 @@ def is_ubuntu_1804() -> bool:
 # def is_ubuntu_1404():
 #     return 'Ubuntu-14.04-trusty' in platform()
 
+
 def is_centos() -> bool:
     return distro.name() == "CentOS"
 
diff --git a/tests/integration/tests/requirements.py b/tests/integration/tests/requirements.py
@@ -21,8 +21,10 @@ def check_apt_package(yaml: List[str]):
         last: str = output.splitlines()[-1]
         expected: str = f"ii  {p}"
         if not last.startswith(expected):
-            errors.append(f"package not (properly) installed: {p} (dpkg output: {output}) ")
-    
+            errors.append(
+                f"package not (properly) installed: {p} (dpkg output: {output}) "
+            )
+
     if errors:
         errors = "\n".join(errors)
         die(errors)
@@ -65,7 +67,7 @@ def check_host(host: str, yaml: Dict):
         return
     # print(f"{host} -> {reqs}")
 
-    for (key, val) in reqs.items():
+    for key, val in reqs.items():
         if key == "apt":
             check_apt(val)
         elif key == "programs":
@@ -92,7 +94,7 @@ def check_file(file: str, yaml):
 
 
 def check(conf):
-    for (cf, yaml) in conf.project_conf.items():
+    for cf, yaml in conf.project_conf.items():
         check_file(cf, yaml)
 
 
diff --git a/tests/integration/tests/templates.py b/tests/integration/tests/templates.py
@@ -97,7 +97,7 @@
 def render_script(template: str, out_path: str, params: Dict):
     out = Template(template).render(**params)
 
-    with open(out_path, 'w') as fh:
+    with open(out_path, "w") as fh:
         fh.writelines(out)
     os.chmod(out_path, stat.S_IREAD | stat.S_IWRITE | stat.S_IEXEC)
 
@@ -107,11 +107,13 @@ def autogen_cargo(conf_file, yaml: Dict) -> Generator[Path]:
     Yield generated paths.
     """
 
-    def render_stage(stage_conf: Mapping[str, Any] | None, filename: str) -> Generator[Path]:
+    def render_stage(
+        stage_conf: Mapping[str, Any] | None, filename: str
+    ) -> Generator[Path]:
         """
         Yield generated paths.
         """
-        
+
         if not isinstance(stage_conf, Mapping):
             return
         if not stage_conf:
@@ -126,10 +128,7 @@ def render_stage(stage_conf: Mapping[str, Any] | None, filename: str) -> Generat
         if rustflags and isinstance(rustflags, str):
             params["extra_rustflags"] = rustflags
 
-        out_path = os.path.join(
-            os.path.dirname(conf_file),
-            filename
-        )
+        out_path = os.path.join(os.path.dirname(conf_file), filename)
         render_script(CARGO_SH, out_path, params)
         yield Path(out_path)
 
@@ -144,7 +143,7 @@ def autogen_refactor(conf_file, yaml: Dict) -> Generator[str]:
     """
     Yield generated paths.
     """
-    
+
     refactor = yaml.get("refactor")
     if refactor and isinstance(refactor, Dict):
         ag = refactor.get("autogen")
@@ -154,7 +153,9 @@ def autogen_refactor(conf_file, yaml: Dict) -> Generator[str]:
             # Get list of transformations from config
             transforms = refactor.get("transforms")
             if transforms and isinstance(transforms, list):
-                lines = [t.strip() for t in transforms if isinstance(t, str) and t.strip()]
+                lines = [
+                    t.strip() for t in transforms if isinstance(t, str) and t.strip()
+                ]
                 if lines:
                     params["transform_lines"] = "\n".join(lines)
             elif transforms and isinstance(transforms, str):
@@ -164,10 +165,7 @@ def autogen_refactor(conf_file, yaml: Dict) -> Generator[str]:
 
             # Only generate script if we have transformations
             if params["transform_lines"]:
-                out_path = os.path.join(
-                    os.path.dirname(conf_file),
-                    "refactor.gen.sh"
-                )
+                out_path = os.path.join(os.path.dirname(conf_file), "refactor.gen.sh")
                 render_script(REFACTOR_SH, out_path, params)
                 yield Path(out_path)
 
@@ -176,7 +174,7 @@ def autogen_transpile(conf_file, yaml: Dict) -> Generator[Path]:
     """
     Yield generated paths.
     """
-    
+
     transpile = yaml.get("transpile")
     if transpile and isinstance(transpile, Dict):
         ag = transpile.get("autogen")
@@ -199,11 +197,7 @@ def autogen_transpile(conf_file, yaml: Dict) -> Generator[Path]:
                     tflags = " ".join(tflags)
                 params["tflags"] = tflags
 
-
-            out_path = os.path.join(
-                os.path.dirname(conf_file),
-                "transpile.gen.sh"
-            )
+            out_path = os.path.join(os.path.dirname(conf_file), "transpile.gen.sh")
             render_script(TRANSPILE_SH, out_path, params)
             yield Path(out_path)
 
@@ -212,8 +206,8 @@ def autogen(conf: Config) -> Generator[Path]:
     """
     Yield generated paths.
     """
-    
-    for (cf, yaml) in conf.project_conf.items():
+
+    for cf, yaml in conf.project_conf.items():
         yield from autogen_transpile(cf, yaml)
         yield from autogen_refactor(cf, yaml)
         yield from autogen_cargo(cf, yaml)
diff --git a/tests/integration/tests/util.py b/tests/integration/tests/util.py
@@ -15,7 +15,7 @@ class Config(object):
     def __init__(self, args):
         self.verbose = args.verbose
         self.projects = args.projects  # projects filter
-        self.stages = args.stages      # stage filter
+        self.stages = args.stages  # stage filter
         self.ignore_requirements = args.ignore_requirements
         self.project_dirs = find_project_dirs(self)
         self.project_conf = {cf: get_yaml(cf) for cf in get_conf_files(self)}
@@ -39,14 +39,14 @@ def lookup(yaml, keys: Sequence[str]):
 
 class Colors(object):
     # Terminal escape codes
-    OKBLUE = '\033[94m'
-    OKGREEN = '\033[92m'
-    WARNING = '\033[93m'
-    FAIL = '\033[91m'
-    NO_COLOR = '\033[0m'
+    OKBLUE = "\033[94m"
+    OKGREEN = "\033[92m"
+    WARNING = "\033[93m"
+    FAIL = "\033[91m"
+    NO_COLOR = "\033[0m"
 
 
-def die(emsg: str, status: int=errno.EINVAL) -> Never:
+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)
@@ -81,8 +81,9 @@ def find_project_dirs(conf: Config) -> List[str]:
     subdirs = sorted(next(os.walk(script_dir))[1])
 
     # filter out __pycache__ and anything else starting with `_`
-    subdirs = list(filter(lambda d: not(d.startswith("_") or d.startswith(".")),
-                          subdirs))
+    subdirs = list(
+        filter(lambda d: not (d.startswith("_") or d.startswith(".")), subdirs)
+    )
 
     if len(conf.projects) > 0:  # only test named project
         projects = list(filter(lambda d: d in conf.projects, subdirs))
@@ -100,7 +101,7 @@ def find_project_dirs(conf: Config) -> List[str]:
 
 
 def get_yaml(file: str) -> dict[str, Any]:
-    with open(file, 'r') as stream:
+    with open(file, "r") as stream:
         try:
             return yaml.safe_load(stream)
         except yaml.YAMLError as exc:
