Fix test failures

Author: A5rocks

mypy/semanal.py

@@ -7567,7 +7567,7 @@ def fail(
         if self.errors._filter_error(self.errors.file, err_info):
             return
 
-        if self.associated_node is None or self.options.semantic_analysis_only:
+        if blocker or self.associated_node is None or self.options.semantic_analysis_only:
             self.errors.add_error_info(err_info)
         else:
             node = self.associated_node
@@ -8155,6 +8155,8 @@ def isolated_error_analysis(self) -> Iterator[None]:
         original_deferral_debug_context_len = len(self.deferral_debug_context)
 
         self.errors = Errors(Options())
+        previous_association = self.associated_node
+        self.associated_node = None
         try:
             yield
         finally:
@@ -8163,6 +8165,7 @@ def isolated_error_analysis(self) -> Iterator[None]:
             self.num_incomplete_refs = original_num_incomplete_refs
             self.progress = original_progress
             self.deferred = original_deferred
+            self.associated_node = previous_association
             del self.deferral_debug_context[original_deferral_debug_context_len:]
 
 

test-data/unit/check-incomplete-fixture.test

@@ -16,48 +16,48 @@ m.x # E: "object" has no attribute "x"
 from typing import Set
 def f(x: Set[int]) -> None: pass
 [out]
-main:1: error: Module "typing" has no attribute "Set"
 main:1: note: Maybe your test fixture does not define "builtins.set"?
 main:1: note: Consider adding [builtins fixtures/set.pyi] to your test description
+main:1: error: Module "typing" has no attribute "Set"
 
 [case testBaseExceptionMissingFromStubs]
 e: BaseException
 [out]
-main:1: error: Name "BaseException" is not defined
 main:1: note: Maybe your test fixture does not define "builtins.BaseException"?
 main:1: note: Consider adding [builtins fixtures/exception.pyi] to your test description
+main:1: error: Name "BaseException" is not defined
 
 [case testExceptionMissingFromStubs]
 e: Exception
 [out]
-main:1: error: Name "Exception" is not defined
 main:1: note: Maybe your test fixture does not define "builtins.Exception"?
 main:1: note: Consider adding [builtins fixtures/exception.pyi] to your test description
+main:1: error: Name "Exception" is not defined
 
 [case testIsinstanceMissingFromStubs]
 if isinstance(1, int):
     pass
 [out]
-main:1: error: Name "isinstance" is not defined
 main:1: note: Maybe your test fixture does not define "builtins.isinstance"?
 main:1: note: Consider adding [builtins fixtures/isinstancelist.pyi] to your test description
+main:1: error: Name "isinstance" is not defined
 
 [case testTupleMissingFromStubs1]
 tuple()
 [out]
-main:1: error: Name "tuple" is not defined
 main:1: note: Maybe your test fixture does not define "builtins.tuple"?
 main:1: note: Consider adding [builtins fixtures/tuple.pyi] to your test description
+main:1: error: Name "tuple" is not defined
 main:1: note: Did you forget to import it from "typing"? (Suggestion: "from typing import Tuple")
 
 [case testTupleMissingFromStubs2]
 tuple()
 from typing import Tuple
 x: Tuple[int, str]
 [out]
-main:1: error: Name "tuple" is not defined
 main:1: note: Maybe your test fixture does not define "builtins.tuple"?
 main:1: note: Consider adding [builtins fixtures/tuple.pyi] to your test description
+main:1: error: Name "tuple" is not defined
 main:1: note: Did you forget to import it from "typing"? (Suggestion: "from typing import Tuple")
 main:3: error: Name "tuple" is not defined
 
@@ -66,15 +66,15 @@ class A:
     @classmethod
     def f(cls): pass
 [out]
-main:2: error: Name "classmethod" is not defined
 main:2: note: Maybe your test fixture does not define "builtins.classmethod"?
 main:2: note: Consider adding [builtins fixtures/classmethod.pyi] to your test description
+main:2: error: Name "classmethod" is not defined
 
 [case testPropertyMissingFromStubs]
 class A:
     @property
     def f(self): pass
 [out]
-main:2: error: Name "property" is not defined
 main:2: note: Maybe your test fixture does not define "builtins.property"?
 main:2: note: Consider adding [builtins fixtures/property.pyi] to your test description
+main:2: error: Name "property" is not defined

test-data/unit/check-statements.test

@@ -2359,9 +2359,9 @@ from typing import _FutureFeatureFixture
 # that day comes this suggestion will also be less helpful than it is today.
 import typing_extensions
 [out]
-main:1: error: Module "typing" has no attribute "_FutureFeatureFixture"
 main:1: note: Use `from typing_extensions import _FutureFeatureFixture` instead
 main:1: note: See https://mypy.readthedocs.io/en/stable/runtime_troubles.html#using-new-additions-to-the-typing-module
+main:1: error: Module "typing" has no attribute "_FutureFeatureFixture"
 [builtins fixtures/tuple.pyi]
 
 [case testNoCrashOnBreakOutsideLoopFunction]

test-data/unit/check-typevar-defaults.test

@@ -930,8 +930,8 @@ reveal_type(C)  # N: Revealed type is "def [T2 = Any] () -> __main__.C[T2`1 = An
 c: C
 reveal_type(c)  # N: Revealed type is "__main__.C[Any]"
 
-class D(Generic[T2, T1]): ...  # E: Type variable T1 referenced in the default of T2 is unbound \
-                               # E: "T1" cannot appear after "T2" in type parameter list because it has no default type
+class D(Generic[T2, T1]): ...  # E: "T1" cannot appear after "T2" in type parameter list because it has no default type \
+                               # E: Type variable T1 referenced in the default of T2 is unbound
 reveal_type(D)  # N: Revealed type is "def [T2 = Any, T1 = Any] () -> __main__.D[T2`1 = Any, T1`2 = Any]"
 d: D
 reveal_type(d)  # N: Revealed type is "__main__.D[Any, Any]"