test fixes

Author: hauntsaninja

test-data/unit/check-functions.test

@@ -3074,11 +3074,11 @@ class B(A):
 
 class C(A):
     @overload
-    def f(self, y: int) -> str: pass
+    def f(self, x: int) -> str: pass
     @override
     @overload
-    def f(self, y: str) -> str: pass
-    def f(self, y: int | str) -> str: pass
+    def f(self, x: str) -> str: pass
+    def f(self, x: int | str) -> str: pass
 [typing fixtures/typing-override.pyi]
 
 [case explicitOverrideOnMultipleOverloads]
@@ -3099,12 +3099,12 @@ class B(A):
 
 class C(A):
     @overload
-    def f(self, y: int) -> str: pass
+    def f(self, x: int) -> str: pass
     @override
     @overload
-    def f(self, y: str) -> str: pass
+    def f(self, x: str) -> str: pass
     @override
-    def f(self, y: int | str) -> str: pass
+    def f(self, x: int | str) -> str: pass
 [typing fixtures/typing-override.pyi]
 
 [case explicitOverrideCyclicDependency]
@@ -3142,13 +3142,13 @@ class A:
 
 class B(A):
     @override
-    def f(self, y: int) -> str: pass
+    def f(self, x: int) -> str: pass
 
 class C(A):
-    def f(self, y: int) -> str: pass  # E: Method "f" is not using @override but is overriding a method in class "__main__.A"
+    def f(self, x: int) -> str: pass  # E: Method "f" is not using @override but is overriding a method in class "__main__.A"
 
 class D(B):
-    def f(self, y: int) -> str: pass  # E: Method "f" is not using @override but is overriding a method in class "__main__.B"
+    def f(self, x: int) -> str: pass  # E: Method "f" is not using @override but is overriding a method in class "__main__.B"
 [typing fixtures/typing-override.pyi]
 
 [case requireExplicitOverrideSpecialMethod]
@@ -3221,26 +3221,26 @@ class A:
 
 class B(A):
     @overload
-    def f(self, y: int) -> str: ...
+    def f(self, x: int) -> str: ...
     @overload
-    def f(self, y: str) -> str: ...
+    def f(self, x: str) -> str: ...
     @override
-    def f(self, y): pass
+    def f(self, x): pass
 
 class C(A):
     @overload
     @override
-    def f(self, y: int) -> str: ...
+    def f(self, x: int) -> str: ...
     @overload
-    def f(self, y: str) -> str: ...
-    def f(self, y): pass
+    def f(self, x: str) -> str: ...
+    def f(self, x): pass
 
 class D(A):
     @overload
-    def f(self, y: int) -> str: ...
+    def f(self, x: int) -> str: ...
     @overload
-    def f(self, y: str) -> str: ...
-    def f(self, y): pass  # E: Method "f" is not using @override but is overriding a method in class "__main__.A"
+    def f(self, x: str) -> str: ...
+    def f(self, x): pass  # E: Method "f" is not using @override but is overriding a method in class "__main__.A"
 [typing fixtures/typing-override.pyi]
 
 [case requireExplicitOverrideMultipleInheritance]
@@ -3250,14 +3250,14 @@ from typing import override
 class A:
     def f(self, x: int) -> str: pass
 class B:
-    def f(self, y: int) -> str: pass
+    def f(self, x: int) -> str: pass
 
 class C(A, B):
     @override
-    def f(self, z: int) -> str: pass
+    def f(self, x: int) -> str: pass
 
 class D(A, B):
-    def f(self, z: int) -> str: pass  # E: Method "f" is not using @override but is overriding a method in class "__main__.A"
+    def f(self, x: int) -> str: pass  # E: Method "f" is not using @override but is overriding a method in class "__main__.A"
 [typing fixtures/typing-override.pyi]
 
 [case testExplicitOverrideAllowedForPrivate]

test-data/unit/check-super.test

@@ -237,7 +237,7 @@ class A:
     def f(self, s: str) -> None: pass
 
 class B(A):
-    def f(self, i: Union[int, str]) -> None: pass
+    def f(self, s: Union[int, str]) -> None: pass
 
 class C:
     def g(self, b: B) -> None:
@@ -251,7 +251,7 @@ class A:
     def f(self, s: str) -> None: pass
 
 class B(A):
-    def f(self, i: Union[int, str]) -> None: pass
+    def f(self, s: Union[int, str]) -> None: pass
 
 def g(b: B) -> None:
     super(B, b).f('42')