Fix tests

Author: JelleZijlstra

mypy/test/teststubtest.py

@@ -1405,9 +1405,16 @@ def spam(x=Flags4(0)): pass
         )
         yield Case(
             stub="""
+            import sys
             from typing import Final, Literal
-            class BytesEnum(bytes, enum.Enum):
-                a = b'foo'
+            from typing_extensions import disjoint_base
+            if sys.version_info >= (3, 12):
+                class BytesEnum(bytes, enum.Enum):
+                    a = b'foo'
+            else:
+                @disjoint_base
+                class BytesEnum(bytes, enum.Enum):
+                    a = b'foo'
             FOO: Literal[BytesEnum.a]
             BAR: Final = BytesEnum.a
             BAZ: BytesEnum

test-data/unit/check-classes.test

@@ -6084,7 +6084,7 @@ class B(A):
     __slots__ = ('a', 'b')
 class C:
     __slots__ = ('x',)
-class D(B, C):
+class D(B, C):  # E: Class "D" has incompatible disjoint bases
     __slots__ = ('aa', 'bb', 'cc')
 [builtins fixtures/tuple.pyi]
 

test-data/unit/check-incremental.test

@@ -3170,21 +3170,21 @@ C(5, 'foo', True)
 
 [file a.py]
 import attrs
-@attrs.define
+@attrs.define(slots=False)
 class A:
     a: int
 
 [file b.py]
 import attrs
-@attrs.define
+@attrs.define(slots=False)
 class B:
     b: str
 
 [file c.py]
 from a import A
 from b import B
 import attrs
-@attrs.define
+@attrs.define(slots=False)
 class C(A, B):
     c: bool
 

test-data/unit/check-slots.test

@@ -180,6 +180,7 @@ b.m = 2
 b.b = 2
 b._two = 2
 [out]
+main:5: error: Class "B" has incompatible disjoint bases
 main:11: error: Trying to assign name "_one" that is not in "__slots__" of type "__main__.B"
 main:16: error: "B" has no attribute "b"
 main:17: error: "B" has no attribute "_two"