Removed subTests or made to their own function

formatting to changelog

Co-authored-by: Jelle Zijlstra <[email protected]>
Co-authored-by: Daraan <[email protected]>

Author: Daraan

CHANGELOG.md

@@ -16,7 +16,7 @@
   subscripted objects) had wrong parameters if they were directly
   subscripted with an `Unpack` object.
   Patch by [Daraan](https://github.com/Daraan).
-- Fix error in subscription of Unpack aliases causing nested Unpacks 
+- Fix error in subscription of `Unpack` aliases causing nested Unpacks 
   to not be resolved correctly. Patch by [Daraan](https://github.com/Daraan).
 
 # Release 4.12.2 (June 7, 2024)

src/test_typing_extensions.py

@@ -5781,40 +5781,45 @@ class D(Protocol[T1, T2, Unpack[Ts]]): pass
 
     def test_substitution(self):
         Ts = TypeVarTuple("Ts")
-        unpacked_str = Unpack[Ts][str]
-        with self.subTest("Check substitution result"):
-            self.assertIs(unpacked_str, str)
+        unpacked_str = Unpack[Ts][str]  # This should not raise an error
+        self.assertIs(unpacked_str, str)
 
     @skipUnless(TYPING_3_11_0, "Needs Issue #103 for <3.11")
     def test_nested_unpack(self):
-        T = TypeVar('T')
         Ts = TypeVarTuple("Ts")
         Variadic = Tuple[int, Unpack[Ts]]
         # Tuple[int, int, Tuple[str, int]]
         direct_subscription = Variadic[int, Tuple[str, int]]
         # Tuple[int, int, Tuple[*Ts, int]]
         TupleAliasTs = Variadic[int, Tuple[Unpack[Ts], int]]
 
-        # if this fails all below are likely to fail too
         # Tuple[int, int, Tuple[str, int]]
         recursive_unpack = TupleAliasTs[str]
         self.assertEqual(direct_subscription, recursive_unpack)
         self.assertEqual(get_args(recursive_unpack), (int, int, Tuple[str, int]))
 
+        # Test with Callable
+        T = TypeVar("T")
+        # Tuple[int, (*Ts) -> T]
+        CallableAliasTsT = Variadic[Callable[[Unpack[Ts]], T]]
+        # Tuple[int, (str, int) -> object]
+        callable_fully_subscripted = CallableAliasTsT[Unpack[Tuple[str, int]], object]
+        self.assertEqual(get_args(callable_fully_subscripted), (int, Callable[[str, int], object]))
+
+    @skipUnless(TYPING_3_11_0, "Needs Issue #103 for <3.11")
+    def test_equivalent_nested_variadics(self):
+        T = TypeVar("T")
+        Ts = TypeVarTuple("Ts")
+        Variadic = Tuple[int, Unpack[Ts]]
         TupleAliasTsT = Variadic[Tuple[Unpack[Ts], T]]
-        # Equivalent Forms
-        with self.subTest("Equivalence of variadic arguments"):
-            nested_tuple_bare = TupleAliasTsT[str, int, object]
-            self.assertEqual(nested_tuple_bare, TupleAliasTsT[Unpack[Tuple[str, int, object]]])
-            self.assertEqual(nested_tuple_bare, TupleAliasTsT[Unpack[Tuple[str, int]], object])
-            self.assertEqual(nested_tuple_bare, TupleAliasTsT[Unpack[Tuple[str]], Unpack[Tuple[int]], object])
-            self.assertEqual(get_args(nested_tuple_bare), (int, Tuple[str, int, object],))
-
-        with self.subTest("With Callable and Unpack"):
-            # Tuple[int, (str, int) -> object]
-            CallableAliasTsT = Variadic[Callable[[Unpack[Ts]], T]]
-            callable_fully_subscripted = CallableAliasTsT[Unpack[Tuple[str, int]], object]
-            self.assertEqual(get_args(callable_fully_subscripted), (int, Callable[[str, int], object],))
+        nested_tuple_bare = TupleAliasTsT[str, int, object]
+
+        self.assertEqual(get_args(nested_tuple_bare), (int, Tuple[str, int, object]))
+        # Variants
+        self.assertEqual(nested_tuple_bare, TupleAliasTsT[Unpack[Tuple[str, int, object]]])
+        self.assertEqual(nested_tuple_bare, TupleAliasTsT[Unpack[Tuple[str, int]], object])
+        self.assertEqual(nested_tuple_bare, TupleAliasTsT[Unpack[Tuple[str]], Unpack[Tuple[int]], object])
+
 
 class TypeVarTupleTests(BaseTestCase):