Simplify test code

Author: WyattBlue

tests/ffwrapper.py

@@ -50,7 +50,6 @@ class FileInfo:
     path: Path
     bitrate: int
     duration: float
-    timecode: str  # in SMPTE
     videos: tuple[VideoStream, ...]
     audios: tuple[AudioStream, ...]
     subtitles: tuple[SubtitleStream, ...]
@@ -135,22 +134,12 @@ def init(self, path: str, log: Log) -> FileInfo:
             ext = sub_exts.get(codec, "vtt")
             subtitles += (SubtitleStream(codec, ext, s.language),)
 
-        def get_timecode() -> str:
-            for d in cont.streams.data:
-                if (result := d.metadata.get("timecode")) is not None:
-                    return result
-            for v in cont.streams.video:
-                if (result := v.metadata.get("timecode")) is not None:
-                    return result
-            return "00:00:00:00"
-
-        timecode = get_timecode()
         bitrate = 0 if cont.bit_rate is None else cont.bit_rate
         dur = 0 if cont.duration is None else cont.duration / av.time_base
 
         cont.close()
 
-        return FileInfo(Path(path), bitrate, dur, timecode, videos, audios, subtitles)
+        return FileInfo(Path(path), bitrate, dur, videos, audios, subtitles)
 
     def __repr__(self) -> str:
         return f"@{self.path.name}"

tests/test.py

@@ -4,8 +4,8 @@
 import shutil
 import subprocess
 import sys
+import argparse
 from collections.abc import Callable
-from dataclasses import dataclass, field
 from fractions import Fraction
 from hashlib import sha256
 from tempfile import mkdtemp
@@ -16,26 +16,12 @@
 
 from ffwrapper import FileInfo
 from log import Log
-from vanparse import ArgumentParser
 
 
-@dataclass(slots=True)
-class TestArgs:
-    only: list[str] = field(default_factory=list)
-    help: bool = False
-    no_failfast: bool = False
-    category: str = "cli"
-
-
-def test_options(parser: ArgumentParser) -> ArgumentParser:
-    parser.add_argument("--only", "-n", nargs="*")
-    parser.add_argument("--no-failfast", flag=True)
-    parser.add_required(
-        "category",
-        nargs=1,
-        choices=("cli", "sub", "all"),
-        metavar="category [options]",
-    )
+def test_options() -> argparse.ArgumentParser:
+    parser = argparse.ArgumentParser(description="Test options")
+    parser.add_argument("--only", "-n", nargs="*", default=[])
+    parser.add_argument("--no-failfast", action="store_true", default=False)
     return parser
 
 
@@ -394,7 +380,9 @@ def test_premiere(self) -> None:
                 continue
 
             p_xml = self.main([f"resources/{test_name}"], ["-exp"], "out.xml")
-            self.main([p_xml], [])
+
+            # TODO: Support premiere XML as input.
+            # self.main([p_xml], [])
 
     def test_export(self):
         for test_name in all_files:
@@ -547,7 +535,7 @@ def test_audio_norm_ebu(self) -> None:
         )
 
 
-def run_tests(tests: list[Callable], args: TestArgs) -> None:
+def run_tests(tests: list[Callable], args) -> None:
     if args.only != []:
         tests = list(filter(lambda t: t.__name__ in args.only, tests))
 
@@ -613,33 +601,25 @@ def timed_test(test_func):
     )
 
 
-def main(sys_args: list[str] | None = None) -> None:
-    if sys_args is None:
-        sys_args = sys.argv[1:]
-
-    args = test_options(ArgumentParser("test")).parse_args(TestArgs, sys_args)
+def main():
+    args = test_options().parse_args()
     run = Runner()
     tests = []
-
     test_methods = {
         name: getattr(run, name)
         for name in dir(Runner)
         if callable(getattr(Runner, name)) and name not in ["main", "raw", "check"]
     }
-
-    if args.category in {"sub", "all"}:
-        tests.extend(
-            [test_methods[name] for name in ["info", "levels", "subdump", "desc"]]
-        )
-
-    if args.category in {"cli", "all"}:
-        tests.extend(
-            [
-                getattr(run, name)
-                for name in dir(Runner)
-                if callable(getattr(Runner, name)) and name.startswith("test_")
-            ]
-        )
+    tests.extend(
+        [test_methods[name] for name in ["info", "levels", "subdump", "desc"]]
+    )
+    tests.extend(
+        [
+            getattr(run, name)
+            for name in dir(Runner)
+            if callable(getattr(Runner, name)) and name.startswith("test_")
+        ]
+    )
     try:
         run_tests(tests, args)
     except KeyboardInterrupt: