gitlab_quality-test_tooling 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69b4478a8c7af86d2dae63c79d0924037feb673486f1ae6f15d5617121a0b9f4
-  data.tar.gz: 9a7f797d54687a515d834cfe0585bca7b87f5a28cd33000d5c06ebea292de56e
+  metadata.gz: 7437a045ff423ca3c6585be2aa13b11d97fd94abb5d8ffd95a14d11f48970b68
+  data.tar.gz: fd91b826d48c661a7b05f196857ec95c7fc59d478e8718ffa9ca5d534f38ffe5
 SHA512:
-  metadata.gz: 50206a9f212b2d78ab38b8433ffb5f22864e8a322b6065b6492a9023104e2caf0097042c8935c913f7d16de982fd3fb04a8438d294865f61caac84eee60d943e
-  data.tar.gz: 1267891667d8bf81617843d65ea6cd9bee2aef24007a2dc53ba92d970529f771dcbf8b8209aba7d59531f40ffac2e2c549444441dcae123c8e70bac1c0d417e7
+  metadata.gz: 4de31f3a187af7c92df5b015c631e5fa1278fa6a3d62f8111294ce07c245236b9e30e78a6760859eee4d024ee0de62dd544201e2d3e4beec73ef7be00f443def
+  data.tar.gz: 1d44821f07f2d61ac2d1b31b0837149bcf015070ffa1c4e6791d4685c3be322ab0991a28bf1551130eaf274045d58855a405b680948673f78aa208c9a34cab77

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab_quality-test_tooling (2.1.0)
+    gitlab_quality-test_tooling (2.2.0)
       activesupport (>= 7.0, < 7.2)
       amatch (~> 0.4.1)
       fog-google (~> 1.24, >= 1.24.1)

data/lib/gitlab_quality/test_tooling/report/concerns/issue_reports.rb

@@ -11,13 +11,15 @@ module GitlabQuality
           FAILED_JOB_DESCRIPTION_REGEX = /First happened in #{JOB_URL_REGEX}\./m
           REPORT_ITEM_REGEX = /^1\. (?<report_date>\d{4}-\d{2}-\d{2}): #{JOB_URL_REGEX} \((?<pipeline_url>\S+)\) ?(?<extra_content>.*)$/
           LATEST_REPORTS_TO_SHOW = 10
+          DISPLAYED_HISTORY_REPORTS_THRESHOLD = 510 # https://gitlab.com/gitlab-org/quality/engineering-productivity/team/-/issues/587
           DAILY_REPORTS_THRESHOLDS = 10
 
           class ReportsList
-            def initialize(preserved_content:, section_header:, reports:, extra_content:)
+            def initialize(preserved_content:, section_header:, reports:, total_reports_count:, extra_content:)
               @preserved_content = preserved_content
               @section_header = section_header
               @reports = reports
+              @total_reports_count = total_reports_count
               @extra_content = extra_content
             end
 
@@ -31,14 +33,14 @@ module GitlabQuality
             end
 
             def reports_count
-              reports.size
+              total_reports_count
             end
 
             def to_s
               [
                 preserved_content,
                 "#{section_header} (#{reports_count})",
-                reports_list,
+                reports_list(total_reports_count),
                 extra_content
               ].reject(&:blank?).compact.join("\n\n")
             end
@@ -53,15 +55,16 @@ module GitlabQuality
 
             private
 
-            attr_reader :preserved_content, :section_header, :reports, :extra_content
+            attr_reader :preserved_content, :section_header, :reports, :total_reports_count, :extra_content
 
-            def reports_list
+            def reports_list(total_reports_count)
               if sorted_reports.size > LATEST_REPORTS_TO_SHOW
+                max_displayed_reports = DISPLAYED_HISTORY_REPORTS_THRESHOLD - LATEST_REPORTS_TO_SHOW
                 [
                   "Last #{LATEST_REPORTS_TO_SHOW} reports:",
-                  sorted_reports[...LATEST_REPORTS_TO_SHOW].join("\n"),
-                  "<details><summary>See #{sorted_reports.size - LATEST_REPORTS_TO_SHOW} more reports</summary>",
-                  sorted_reports[LATEST_REPORTS_TO_SHOW..].join("\n"),
+                  displayed_reports[...LATEST_REPORTS_TO_SHOW].join("\n"),
+                  "<details><summary>With #{total_reports_count - LATEST_REPORTS_TO_SHOW} more reports (displaying up to #{max_displayed_reports} reports) </summary>",
+                  displayed_reports[LATEST_REPORTS_TO_SHOW..].join("\n"),
                   "</details>"
                 ].join("\n\n")
               else
@@ -70,7 +73,12 @@ module GitlabQuality
             end
 
             def sorted_reports
-              @sorted_reports ||= reports.sort.reverse
+              @sorted_reports ||=
+                reports.sort_by { |report| [report.report_date, report.job_id, report.to_s] }.reverse
+            end
+
+            def displayed_reports
+              sorted_reports[0...DISPLAYED_HISTORY_REPORTS_THRESHOLD]
             end
           end
 
@@ -88,8 +96,8 @@ module GitlabQuality
               "1. #{report_date}: #{job_url} (#{pipeline_url}) #{extra_content}".strip
             end
 
-            def <=>(other)
-              to_s <=> other.to_s
+            def job_id
+              job_url.split('/').last
             end
 
             private
@@ -122,14 +130,33 @@ module GitlabQuality
             preserved_content = current_reports_content.split(reports_section_header).first&.strip
             reports = report_lines(current_reports_content) + [ReportsList.report_list_item(test, item_extra_content: item_extra_content)]
 
+            total_reports_count = increment_total_reports_count(
+              reports_section_header: reports_section_header,
+              content: current_reports_content,
+              reports: reports
+            )
+
             ReportsList.new(
               preserved_content: preserved_content,
               section_header: reports_section_header,
               reports: reports,
+              total_reports_count: total_reports_count,
               extra_content: reports_extra_content
             )
           end
 
+          def increment_total_reports_count(reports_section_header:, content:, reports:)
+            reports_count = reports.count
+
+            return reports_count if reports_count < DISPLAYED_HISTORY_REPORTS_THRESHOLD
+
+            count_match = content.match(/#{Regexp.escape(reports_section_header)} \((\d+)\)/)
+
+            return reports_count unless count_match
+
+            count_match[1].to_i + 1
+          end
+
           def failed_issue_job_url(issue)
             job_urls_from_description(issue.description, REPORT_ITEM_REGEX).last ||
               # Legacy format

data/lib/gitlab_quality/test_tooling/test_results/json_test_results.rb

@@ -16,9 +16,14 @@ module GitlabQuality
 
         def parse
           JSON.parse(File.read(path))
+        rescue JSON::ParserError
+          Runtime::Logger.debug("#{self.class.name}##{__method__} attempted to parse invalid JSON at path: #{path}")
+          {}
         end
 
         def process
+          return [] if results.empty?
+
           results['examples'].map do |test|
             GitlabQuality::TestTooling::TestResult::JsonTestResult.new(report: test, project: project, token: token)
           end

data/lib/gitlab_quality/test_tooling/version.rb

@@ -2,6 +2,6 @@
 
 module GitlabQuality
   module TestTooling
-    VERSION = "2.1.0"
+    VERSION = "2.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_quality-test_tooling
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-22 00:00:00.000000000 Z
+date: 2024-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control