Fix skipTest inside subTest

src/pytest_subtests/plugin.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import copy
 import sys
 import time
 from contextlib import contextmanager
@@ -13,6 +14,7 @@
 from typing import Mapping
 from typing import TYPE_CHECKING
 from unittest import TestCase
+from unittest.case import _SubTest  # type: ignore[attr-defined]
 
 import attr
 import pluggy
@@ -98,6 +100,24 @@ def _from_test_report(cls, test_report: TestReport) -> SubTestReport:
         return super()._from_json(test_report._to_json())
 
 
+def _addSkip(self: TestCaseFunction, testcase: TestCase, reason: str) -> None:
+    if isinstance(testcase, _SubTest):
+        self._originaladdSkip(testcase, reason)  # type: ignore[attr-defined]
+        if self._excinfo is not None:
+            exc_info = self._excinfo[-1]
+            self.addSubTest(testcase.test_case, testcase, exc_info)  # type: ignore[attr-defined]
+    else:
+        # The non-subtest skips have to be added by `_originaladdSkip` only after all subtest failures are processed by
+        # `_addSubTest`.
+        if (
+            len(
+                [x for x, y in self.instance._outcome.errors if isinstance(x, _SubTest)]
+            )
+            == 0
+        ):
+            self._originaladdSkip(testcase, reason)  # type: ignore[attr-defined]
+
+
 def _addSubTest(
     self: TestCaseFunction,
     test_case: Any,
@@ -122,10 +142,27 @@ def _addSubTest(
                 node=self, call=call_info, report=sub_report
             )
 
+        # Add non-subtest skips once all subtest failures are processed by # `_addSubTest`.
+        non_subtest_skip = [
+            (x, y)
+            for x, y in self.instance._outcome.skipped
+            if not isinstance(x, _SubTest)
+        ]
+        subtest_errors = [
+            (x, y) for x, y in self.instance._outcome.errors if isinstance(x, _SubTest)
+        ]
+        if len(subtest_errors) > 0 and len(non_subtest_skip) > 0:
+            last_subset_error = subtest_errors[-1]
+            if exc_info is last_subset_error[-1]:
+                for testcase, reason in non_subtest_skip:
+                    self._originaladdSkip(testcase, reason)  # type: ignore[attr-defined]
+
 
 def pytest_configure(config: pytest.Config) -> None:
     TestCaseFunction.addSubTest = _addSubTest  # type: ignore[attr-defined]
     TestCaseFunction.failfast = False  # type: ignore[attr-defined]
+    TestCaseFunction._originaladdSkip = copy.copy(TestCaseFunction.addSkip)  # type: ignore[attr-defined]
+    TestCaseFunction.addSkip = _addSkip  # type: ignore[method-assign]
 
     # Hack (#86): the terminal does not know about the "subtests"
     # status, so it will by default turn the output to yellow.
@@ -154,6 +191,9 @@ def pytest_unconfigure() -> None:
         del TestCaseFunction.addSubTest
     if hasattr(TestCaseFunction, "failfast"):
         del TestCaseFunction.failfast
+    if hasattr(TestCaseFunction, "_originaladdSkip"):
+        TestCaseFunction.addSkip = copy.copy(TestCaseFunction._originaladdSkip)  # type: ignore[method-assign]
+        del TestCaseFunction._originaladdSkip
 
 
 @pytest.fixture