From 9196e95ff1d4ea91092a61805cc6f06563a31c9d Mon Sep 17 00:00:00 2001
From: wyattscarpenter <wyattscarpenter@gmail.com>
Date: Mon, 23 Feb 2026 23:45:20 -0700
Subject: [PATCH] investigate and change a couple of -skips to -xfails

There are surely more that should be dealt with. This addresses part of https://github.com/python/mypy/issues/20881
---
 test-data/unit/check-generic-subtyping.test | 2 +-
 test-data/unit/merge.test                   | 2 +-
 test-data/unit/typexport-basic.test         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test-data/unit/check-generic-subtyping.test b/test-data/unit/check-generic-subtyping.test
index 7e954a6a66859..a2d9a251d5ed7 100644
--- a/test-data/unit/check-generic-subtyping.test
+++ b/test-data/unit/check-generic-subtyping.test
@@ -514,7 +514,7 @@ class E: pass
 [builtins fixtures/tuple.pyi]
 [out]
 
-[case testSubtypingWithTypeImplementingGenericABCViaInheritance2-skip]
+[case testSubtypingWithTypeImplementingGenericABCViaInheritance2-xfail]
 from typing import TypeVar, Generic
 T = TypeVar('T')
 class I(Generic[T]): pass
diff --git a/test-data/unit/merge.test b/test-data/unit/merge.test
index 79c3efbc304bb..b1d818ffa3ff5 100644
--- a/test-data/unit/merge.test
+++ b/test-data/unit/merge.test
@@ -1392,7 +1392,7 @@ target:
     D: TypeInfo<5>
     NewType: Var<4>
 
-[case testCallable_symtable-skip]
+[case testCallable_symtable-xfail]
 # The TypeInfo is currently not being merged correctly
 import target
 [file target.py]
diff --git a/test-data/unit/typexport-basic.test b/test-data/unit/typexport-basic.test
index 77e7763824d64..ed2bf35ba2170 100644
--- a/test-data/unit/typexport-basic.test
+++ b/test-data/unit/typexport-basic.test
@@ -345,7 +345,7 @@ CallExpr(5) : T`1
 MemberExpr(5) : def () -> T`1
 NameExpr(5) : A[T`1]
 
-[case testGenericFunctionCallWithTypeApp-skip]
+[case testGenericFunctionCallWithTypeApp-xfail]
 ## CallExpr|TypeApplication|NameExpr
 from typing import Any, TypeVar, Tuple
 T = TypeVar('T')