fixed tests after switch to using nested bytes repr instead of hashes for nested types

Author: tclose

pydra/utils/hash.py

@@ -242,7 +242,15 @@ def type_name(tp):
     origin = ty.get_origin(klass)
     if origin:
         yield f"{origin.__module__}.{type_name(origin)}[".encode()
-        yield from (b for t in ty.get_args(klass) for b in bytes_repr_type(t, cache))
+        for arg in ty.get_args(klass):
+            if isinstance(
+                arg, list
+            ):  # sometimes (e.g. Callable) the args of a type is a list
+                yield b"["
+                yield from (b for t in arg for b in bytes_repr_type(t, cache))
+                yield b"]"
+            else:
+                yield from bytes_repr_type(arg, cache)
         yield b"]"
     else:
         yield f"{klass.__module__}.{type_name(klass)}".encode()

pydra/utils/tests/test_hash.py

@@ -181,12 +181,14 @@ class MyClass(ty.Generic[T]):
         pass
 
     obj_repr = join_bytes_repr(MyClass[int])
-    assert obj_repr == b"type:(pydra.utils.tests.test_hash.MyClass[type:(int)])"
+    assert (
+        obj_repr == b"type:(pydra.utils.tests.test_hash.MyClass[type:(builtins.int)])"
+    )
 
 
 def test_bytes_special_form1():
     obj_repr = join_bytes_repr(ty.Union[int, float])
-    assert re.match(rb"type:\(typing.Union\[.{32}\]\)", obj_repr)
+    assert obj_repr == b"type:(typing.Union[type:(builtins.int)type:(builtins.float)])"
 
 
 def test_bytes_special_form2():
@@ -196,20 +198,22 @@ def test_bytes_special_form2():
 
 def test_bytes_special_form3():
     obj_repr = join_bytes_repr(ty.Optional[Path])
-    assert re.match(rb"type:\(typing.Union\[.{32}\]\)", obj_repr, flags=re.DOTALL)
+    assert (
+        obj_repr == b"type:(typing.Union[type:(pathlib.Path)type:(builtins.NoneType)])"
+    )
 
 
 def test_bytes_special_form4():
     obj_repr = join_bytes_repr(ty.Type[Path])
-    assert re.match(rb"type:\(builtins.type\[.{16}\]\)", obj_repr, flags=re.DOTALL)
+    assert obj_repr == b"type:(builtins.type[type:(pathlib.Path)])"
 
 
 def test_bytes_special_form5():
     obj_repr = join_bytes_repr(ty.Callable[[Path, int], ty.Tuple[float, str]])
-    assert re.match(
-        rb"type:\(collections.abc.Callable\[.{32}\]\)", obj_repr, flags=re.DOTALL
+    assert obj_repr == (
+        b"type:(collections.abc.Callable[[type:(pathlib.Path)type:(builtins.int)]"
+        b"type:(builtins.tuple[type:(builtins.float)type:(builtins.str)])])"
     )
-    assert obj_repr != join_bytes_repr(ty.Callable[[Path, int], ty.Tuple[float, bytes]])
 
 
 def test_recursive_object():