Fix intermittent commenter to increment failures instead of hardcode 1 (#8788)

Author: jmaher

tests/conftest.py

@@ -502,6 +502,24 @@ def eleven_jobs_stored(test_repository, failure_classifications, hundred_job_blo
     store_job_data(test_repository, hundred_job_blobs)
 
 
+@pytest.fixture
+def five_intermittent_jobs(test_repository, hundred_job_blobs, create_jobs):
+    """make multiple failures for same platform/variant"""
+    jobs = []
+    for i in range(0, 5):
+        # this allows every other task to repeat the job name
+        if i % 2 == 0:
+            name = hundred_job_blobs[i]["job"]["name"]
+
+        job = hundred_job_blobs[i]
+        job["job"].update({"name": name})
+        jobs.append(job)
+    return create_jobs(jobs)[0]
+
+
+#    store_job_data(test_repository, hundred_job_blobs[0:5])
+
+
 @pytest.fixture
 def taskcluster_jobs_stored(test_repository, sample_data):
     """stores a list of TaskCluster job samples"""
@@ -1229,7 +1247,7 @@ def bug_data(eleven_jobs_stored, test_repository, test_push, bugs):
 
 
 @pytest.fixture
-def bug_data_with_5_failures(eleven_jobs_stored, test_repository, test_push, bugs):
+def bug_data_with_5_failures(five_intermittent_jobs, test_repository, test_push, bugs):
     jobs = th_models.Job.objects.all().order_by("id")
     bug_id = bugs[0].bugzilla_id
     for index, job in enumerate(jobs[:5]):

tests/intermittents_commenter/expected_comment_with_5_failures.text

@@ -5,11 +5,10 @@ This is the #1 most frequent failure this week.
 * mozilla-central: 5
 
 ## Table
-| |**1proc**|**a11y_checks+swgl**|**no_variant**|**socketprocess_networking**|**spi-nw**|**swgl**|**swr**|
-|---|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
-|**linux1804-x86_64/debug**|1| |1| |1| | |
-|**macosx1015-x86_64/debug**| | | | |1| | |
-|**macosx1470-x86_64/debug**| | | | | | |1|
+| |**a11y_checks+swgl**|**no_variant**|**socketprocess_networking**|**spi-nw**|**swgl**|
+|---|:-:|:-:|:-:|:-:|:-:|
+|**linux1804-x86_64/debug**| |1| |2| |
+|**macosx1015-x86_64/debug**| | | |2| |
 
 ## For more details, see:
 https://treeherder.mozilla.org/intermittent-failures/bugdetails?bug=1&startday=2022-05-09&endday=2025-05-10&tree=all

treeherder/intermittents_commenter/commenter.py

@@ -500,7 +500,11 @@ def build_bug_map(self, bugs, option_collection_map, start_day, end_day):
                 data_table = bug_infos.data_table
                 platform_and_build_data = data_table.get(platform_and_build, {})
                 data_table[platform_and_build] = platform_and_build_data
-                data_table[platform_and_build][test_variant] = {"count": 1, "runs": run_count}
+                data_table[platform_and_build][test_variant] = {
+                    "count": platform_and_build_data.get(test_variant, {}).get("count", 0) + 1,
+                    "runs": run_count,
+                }
+
         return bug_map
 
     def get_alt_date_bug_totals(self, startday, endday, bug_ids):