Intermittent fixes (#8380)

* fix: remove useless accumulation of test variant

* fix: tighten the search conditions for variants

* add a test for get_test_variant method

---------

Co-authored-by: Olivier Giorgis <ogiorgis@logilab.fr>

Author: djangoliv

tests/intermittents_commenter/test_commenter.py

@@ -80,3 +80,13 @@ def test_intermittents_commenter_with_failures(
     with open("tests/intermittents_commenter/expected_comment_with_5_failures.text") as comment:
         expected_comment = comment.read()
     assert comment_params[0]["changes"]["comment"]["body"] == expected_comment
+
+
+def test_get_test_variants(mock_test_variants_firefoxci_request):
+    process = Commenter(weekly_mode=True, dry_run=True)
+    test_suite = "mochitest-browser-chrome-spi-nw-10"
+    variants = process.get_test_variant(test_suite)
+    assert variants == "spi-nw"
+    test_suite = "mochitest-browser-chrome-2"
+    variants = process.get_test_variant(test_suite)
+    assert variants == "no_variant"

treeherder/intermittents_commenter/commenter.py

@@ -65,7 +65,7 @@ def generate_bug_changes(self, startday, endday, alt_startday, alt_endday):
             change_whiteboard = None
             priority = 0
             rank = top_bugs.index(bug_id) + 1 if self.weekly_mode and bug_id in top_bugs else None
-            test_variants |= bug_stats[bug_id]["test_variants"]
+            test_variants = bug_stats[bug_id]["test_variants"]
 
             if bugs_info and bug_id in bugs_info:
                 if self.weekly_mode:
@@ -353,7 +353,7 @@ def get_test_variant(self, test_suite):
         base_symbol = test_suite
         found_variants = []
         for variant in variant_symbols:
-            if f"-{variant}" in base_symbol:
+            if f"-{variant}-" in base_symbol or base_symbol.endswith(variant):
                 found_variants.append(variant)
                 base_symbol = base_symbol.replace(f"-{variant}", "")
         if not found_variants: