fix errors caught by mypy

tangentcode · Jan 23, 2024 · 5d46bf4 · 5d46bf4
1 parent c5bfc85
commit 5d46bf4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/tanco/model.py b/tanco/model.py
@@ -67,8 +67,8 @@ def error_lines(self):
 @dataclass
 class TestResult:
     kind: ResultKind
-    error: TestFailure = None
-    rule: ValidationRule = None
+    error: TestFailure | None = None
+    rule: ValidationRule | None = None
     actual: list[str] = field(default_factory=list)
 
     @staticmethod

diff --git a/tanco/orgtest.py b/tanco/orgtest.py
@@ -38,7 +38,7 @@
 
 from .model import Challenge, TestDescription
 
-OldTestDescription = namedtuple('TestDescription', ['name', 'lines'])
+OldTestDescription = namedtuple('OldTestDescription', ['name', 'lines'])
 
 
 class TestReaderStateMachine:

diff --git a/tanco/runner.py b/tanco/runner.py
@@ -134,6 +134,7 @@ def local_check_output(cfg: m.Config, actual: list[str], test: TestDescription):
         case ResultKind.Fail:
             # a regression! (test failed and have the rule,
             # so we have to tell the server)
+            assert local_res.error is not None
             fail(cfg, local_res.error.error_lines(), test.name, local_res)
         case ResultKind.AskServer:
             client = TancoClient()
@@ -191,7 +192,7 @@ def run_tests(cfg: Config):
             for line in test.ilines:
                 print(line)
             print()
-            fail(cfg, e.error_lines(), test)
+            fail(cfg, e.error_lines(), test.name)
 
 
 def find_target(cfg: Config, argv: list[str]) -> Config: