Merge pull request #138 from pytest-dev/subtests

add initial subtests support

Author: asottile

pygments_pytest.py

@@ -50,6 +50,7 @@ def status_line(self, match: Match[str]) -> Generator[Tok, None, None]:
         for k, color in (
                 ('failed', Color.Red),
                 ('passed', Color.Green),
+                ('subpassed', Color.Green),
                 ('skipped', Color.Yellow),
                 ('deselected', Color.Yellow),
                 ('xfailed', Color.Yellow),
@@ -89,6 +90,7 @@ def status_line(self, match: Match[str]) -> Generator[Tok, None, None]:
                 r'^(?P<before>=+ )?'
                 r'(?P<failed>\d+ failed)?(?P<failedcomma>, )?'
                 r'(?P<passed>\d+ passed)?(?P<passedcomma>, )?'
+                r'(?P<subpassed>\d+ subtests passed)?(?P<subpassedcomma>, )?'
                 r'(?P<skipped>\d+ skipped)?(?P<skippedcomma>, )?'
                 r'(?P<deselected>\d+ deselected)?(?P<deselectedcomma>, )?'
                 r'(?P<xfailed>\d+ xfailed)?(?P<xfailedcomma>, )?'
@@ -104,6 +106,7 @@ def status_line(self, match: Match[str]) -> Generator[Tok, None, None]:
         ],
         'progress_line': [
             (r'^[^ ]+ (?=[^ \n]+(?: \(.+\))? +\[)', pygments.token.Text),
+            (r'SUBPASSED\([^)]+\)|u', Color.Green),
             (r'PASSED|\.', Color.Green),
             (r' +', pygments.token.Text),
             (r'\n', pygments.token.Text, '#pop'),

tests/pygments_pytest_test.py

@@ -91,6 +91,16 @@ def test_warnings(compare):
     )
 
 
+@pytest.mark.xfail(reason='unreleased feature')
+def test_subtests(compare):
+    compare(
+        'def test(subtests):\n'
+        '    for i in range(5):\n'
+        '        with subtests.test():\n'
+        '            pass\n',
+    )
+
+
 DIFFERENT_TYPES_SRC = '''\
 import warnings
 import pytest