fixup! ci: print group section lines for GitHub workflow

systemd · Mar 13, 2024 · 3c02468 · 3c02468
1 parent 1edd167
commit 3c02468
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1+
 
+import contextlib
 import os
 import subprocess
 import sys
@@ -165,12 +166,11 @@ def suspend_capture_stdin(pytestconfig: Any) -> Iterator[None]:
         capmanager.resume_global_capture()
 
 
-def begin_group(s: str) -> None:
+@contextlib.contextmanager
+def ci_group(s: str) -> Iterator[None]:
     if os.getenv("MKOSI_CI_SECTION") == "github":
         print("", flush=True)
         print(f"::group::{s}", flush=True)
-
-
-def end_group() -> None:
+    yield
     if os.getenv("MKOSI_CI_SECTION") == "github":
         print("::endgroup::", flush=True)
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -6,7 +6,7 @@
 from mkosi.config import parse_config
 from mkosi.distributions import Distribution, detect_distribution
 
-from . import Image, begin_group, end_group
+from . import Image, ci_group
 
 
 def pytest_addoption(parser: Any) -> None:
@@ -54,6 +54,5 @@ def config(request: Any) -> Image.Config:
 
 @pytest.fixture(autouse=True)
 def github_ci_sections(request: Any) -> Any:
-    begin_group(request.node.name)
-    yield
-    end_group()
+    with ci_group(request.node.name):
+        yield
diff --git a/tests/test_initrd.py b/tests/test_initrd.py
@@ -20,7 +20,7 @@
 from mkosi.user import INVOKING_USER
 from mkosi.versioncomp import GenericVersion
 
-from . import Image, begin_group, end_group
+from . import Image, ci_group
 
 pytestmark = pytest.mark.integration
 
@@ -40,25 +40,25 @@ def passphrase() -> Iterator[Path]:
 
 @pytest.fixture(scope="module")
 def initrd(config: Image.Config) -> Iterator[Image]:
-    if config.tools_tree_distribution:
-        begin_group(f"Initrd image {config.distribution}/{config.release} (no tools tree)")
-    else:
-        begin_group(
+    with (
+        ci_group(
             f"Initrd image {config.distribution}/{config.release} using {config.tools_tree_distribution} tools tree"
-        )
-    with Image(
-        config,
-        options=[
-            "--directory", "",
-            "--include=mkosi-initrd/",
-        ],
-    ) as initrd:
+            if config.tools_tree_distribution else
+            f"Initrd image {config.distribution}/{config.release} (no tools tree)"
+        ),
+        Image(
+            config,
+            options=[
+                "--directory", "",
+                "--include=mkosi-initrd/",
+            ],
+        ) as initrd
+    ):
         if initrd.config.distribution == Distribution.rhel_ubi:
             pytest.skip("Cannot build RHEL-UBI initrds")
 
         initrd.build()
         yield initrd
-    end_group()
 
 
 def test_initrd(initrd: Image) -> None: