From f7224dd159c2c74ccd5cab1637b4552ecee6442b Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Tue, 15 Apr 2025 14:05:44 +0200
Subject: [PATCH] ci/lava: Collapse more log sections

These sections were not collapsed, causing the setup sections to clutter
the job logs.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34523>
---
 .gitlab-ci/lava/utils/log_section.py    | 5 ++++-
 .gitlab-ci/tests/utils/test_lava_log.py | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci/lava/utils/log_section.py b/.gitlab-ci/lava/utils/log_section.py
index 06157d4eb9a..4fc4c0c9f09 100644
--- a/.gitlab-ci/lava/utils/log_section.py
+++ b/.gitlab-ci/lava/utils/log_section.py
@@ -122,6 +122,7 @@ LOG_SECTIONS = (
         section_id="{}",
         section_header="test_case {}",
         section_type=LogSectionType.TEST_CASE,
+        collapsed=True,
     ),
     LogSection(
         regex=re.compile(r"<?STARTRUN>? ([^>]*ssh.*server.*)"),
@@ -129,6 +130,7 @@ LOG_SECTIONS = (
         section_id="{}",
         section_header="[dut] test_suite {}",
         section_type=LogSectionType.TEST_DUT_SUITE,
+        collapsed=True,
     ),
     LogSection(
         regex=re.compile(r"<?STARTRUN>? ([^>]*)"),
@@ -136,13 +138,14 @@ LOG_SECTIONS = (
         section_id="{}",
         section_header="[docker] test_suite {}",
         section_type=LogSectionType.TEST_SUITE,
+        collapsed=True,
     ),
     LogSection(
         regex=re.compile(r"ENDTC>? ([^>]+)"),
         levels=("target", "debug"),
         section_id="post-{}",
         section_header="Post test_case {}",
-        collapsed=True,
         section_type=LogSectionType.LAVA_POST_PROCESSING,
+        collapsed=True,
     ),
 )
diff --git a/.gitlab-ci/tests/utils/test_lava_log.py b/.gitlab-ci/tests/utils/test_lava_log.py
index 9d9f6d9713d..29f5edf9d26 100644
--- a/.gitlab-ci/tests/utils/test_lava_log.py
+++ b/.gitlab-ci/tests/utils/test_lava_log.py
@@ -118,13 +118,13 @@ def test_gl_sections():
     section_types = [s.type for s in lf.section_history]
 
     assert "section_start" in parsed_lines[0]
-    assert "collapsed=true" not in parsed_lines[0]
+    assert "collapsed=true" in parsed_lines[0]
     assert "section_end" in parsed_lines[1]
     assert "section_start" in parsed_lines[2]
-    assert "collapsed=true" not in parsed_lines[2]
+    assert "collapsed=true" in parsed_lines[2]
     assert "section_end" in parsed_lines[3]
     assert "section_start" in parsed_lines[4]
-    assert "collapsed=true" not in parsed_lines[4]
+    assert "collapsed=true" in parsed_lines[4]
     assert "section_end" in parsed_lines[5]
     assert "section_start" in parsed_lines[6]
     assert "collapsed=true" in parsed_lines[6]