Refactoring of some tests.

PiperOrigin-RevId: 730849087

pytype/tests/test_attr2.py

@@ -145,7 +145,7 @@ class Foo:
     """)
 
   def test_converter_with_varargs(self):
-    self.CheckWithErrors("""
+    self.Check("""
       import attr
       def convert(*args, **kwargs) -> int:
         return 42

pytype/tests/test_classes1.py

@@ -1187,7 +1187,7 @@ def f() -> C[int]: ...
       self.assertErrorRegexes(errors, {"e": r"C"})
 
   def test_call_parameterized_class(self):
-    self.InferWithErrors("""
+    self.Check("""
       from typing import Deque
       list[str]()
       Deque[str]()

pytype/tests/test_dataclass_transform.py

@@ -47,7 +47,7 @@ class TestFunction(test_base.BaseTest):
   """Tests for @dataclass_transform on functions."""
 
   def test_py_function(self):
-    self.CheckWithErrors("""
+    self.Check("""
       from typing_extensions import dataclass_transform
 
       # NOTE: The decorator overrides the function body and makes `dc` a
@@ -233,7 +233,7 @@ def __init__(self, x: int) -> None: ...
     )
 
   def test_write_pyi(self):
-    ty, _ = self.InferWithErrors("""
+    ty = self.Infer("""
       from typing_extensions import dataclass_transform
       @dataclass_transform()
       class Mixin: ...

pytype/tests/test_enums.py

@@ -193,7 +193,7 @@ class M(enum.Enum):
         def get_m(name: str) -> M: ...
       """,
       )
-      self.CheckWithErrors(
+      self.Check(
           """
         import foo
         def print_m(name: str):
@@ -1331,7 +1331,7 @@ class NoFn(enum.Enum):
           x: Annotated[str, 'property']
       """,
       )
-      self.CheckWithErrors(
+      self.Check(
           """
         import foo
         assert_type(foo.Fn.A.value, int)

pytype/tests/test_fiddle_overlay.py

@@ -294,7 +294,7 @@ def __init__(self: Simple, x: int, y: str): ...
 
   def test_typevar(self):
     with self.DepTree([("fiddle.pyi", _FIDDLE_PYI)]):
-      self.CheckWithErrors(f"""
+      self.Check(f"""
         import dataclasses
         import fiddle
         from typing import TypeVar

pytype/tests/test_import1.py

@@ -1354,7 +1354,7 @@ class X:
     init_pyi_1, _ = self.InferWithErrors(
         init_py % "  # import-error", module_name="mod.__init__"
     )
-    submod_pyi_1, _ = self.InferWithErrors(submod_py, module_name="mod.submod")
+    submod_pyi_1 = self.Infer(submod_py, module_name="mod.submod")
     with test_utils.Tempdir() as d:
       init_path = d.create_file(
           file_utils.replace_separator("mod/__init__.pyi"),

pytype/tests/test_list2.py

@@ -89,7 +89,7 @@ def test_getitem_slot(self):
 
   def test_slice_returntype(self):
     # each of the superclasses of list should return their own type when sliced.
-    ty, _ = self.InferWithErrors("""
+    ty = self.Infer("""
       from typing import Sequence, MutableSequence
       a: Sequence[int] = [1]
       b = a[0:1]

pytype/tests/test_match2.py

@@ -683,7 +683,7 @@ def baz(os: Optional[str]):
     """)
 
   def test_optional_str_against_plain_iterable(self):
-    self.CheckWithErrors("""
+    self.Check("""
       from typing import Iterable, Optional
       def foo(x: Iterable): ...
 

pytype/tests/test_methods1.py

@@ -937,7 +937,7 @@ def f():
     )
 
   def test_func_name(self):
-    ty, _ = self.InferWithErrors("""
+    ty = self.Infer("""
       def f():
         pass
       f.func_name = 3.1415

pytype/tests/test_operators1.py

@@ -391,7 +391,7 @@ def test_subscr(self):
     # Make sure we don't crash due to __path__[0] having no bindings. Previously
     # we were not setting __path__[0] to [unsolvable] if report_errors was False
     self.options.tweak(report_errors=False)
-    self.InferWithErrors("""
+    self.Check("""
       { 'path': __path__[0] }
     """)
 

pytype/tests/test_paramspec.py

@@ -430,7 +430,7 @@ def f(x: str) -> int: ...
       def f(x: str, *, y: int = 0) -> int: ...
     """,
     )]):
-      ty, _ = self.InferWithErrors("""
+      ty = self.Infer("""
         import foo
 
         f = foo.decorator(foo.f)

pytype/tests/test_typeguard.py

@@ -80,7 +80,7 @@ class PyiTest(test_base.BaseTest):
 
   @test_utils.skipBeforePy((3, 10), "New in 3.10")
   def test_infer(self):
-    ty, _ = self.InferWithErrors("""
+    ty = self.Infer("""
       from typing import TypeGuard
       def f(x: object) -> TypeGuard[int]:
         return isinstance(x, int)
@@ -94,7 +94,7 @@ def f(x: object) -> TypeGuard[int]: ...
     )
 
   def test_infer_extension(self):
-    ty, _ = self.InferWithErrors("""
+    ty = self.Infer("""
       from typing_extensions import TypeGuard
       def f(x: object) -> TypeGuard[int]:
         return isinstance(x, int)

pytype/tests/test_typing_namedtuple2.py

@@ -402,7 +402,7 @@ class X(NamedTuple):
           b: int
       """,
       )
-      ty, unused_errorlog = self.InferWithErrors(
+      ty = self.Infer(
           """
         import foo
         v = None  # type: foo.X