Merge pull request #656 from mozilla/philimon/l10n_workflow_fix

Philimon/Fix_l10n_workflow

Author: philimon-reset

.github/workflows/l10n.yml

@@ -138,12 +138,16 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: "3.11"
+      - name: Set Environment (Scheduled Beta)
+        if: ${{ inputs.job_to_run == 'L10N-Linux' }}
+        run: |
+          echo "TESTRAIL_REPORT='true'" >> "$GITHUB_ENV";
+          echo "Running report for most recent Beta on Linux";
       - name: Install dependencies
         id: setup
         env:
           MANUAL_DOWNLOAD_LINK: ${{ inputs.linux_tarball_link }}
         run: |
-          echo "MANUAL='true'" >> "$GITHUB_ENV";
           echo "Running l10n tests on supplied executable";
           sudo apt install gnome-screenshot;
           uname -m;
@@ -225,7 +229,7 @@ jobs:
           New-item -Name .env -Value $env_contents -ItemType File -Force
           Write-Host "Running l10n tests on supplied executable"
       - name: Set Environment (Scheduled Beta)
-        if: ${{ inputs.job_to_run == 'Smoke-Windows' }}
+        if: ${{ inputs.job_to_run == 'L10N-Windows' }}
         run: |
           $env_contents = @"
           TESTRAIL_REPORT='true'

l10n_CM/run_l10n.py

@@ -24,7 +24,7 @@
     "bestbuy",
     "decathlon",
     "vans",
-    "ebay"
+    "ebay",
 }
 live_sites = []
 

modules/testrail.py

@@ -391,7 +391,7 @@ def update_test_cases(
         testrail_suite_id,
         test_case_ids=[],
         status="passed",
-        elapsed=[]
+        elapsed=[],
     ):
         """Given a project id, a run id, and a suite id, for each case given a status,
         update the test objects with the correct status code"""
@@ -409,14 +409,14 @@ def update_test_cases(
                     testrail_project_id, testrail_suite_id
                 )
             ]
-        
+
         results = []
         for i in range(len(test_case_ids)):
             results.append(
                 {
                     "case_id": test_case_ids[i],
                     "status_id": status_key.get(status),
-                    "elapsed": elapsed[i]
+                    "elapsed": elapsed[i],
                 }
             )
         logging.warning(f"Going to update cases with payload: {results}")

modules/testrail_integration.py

@@ -262,7 +262,7 @@ def mark_results(testrail_session: TestRail, test_results):
                     durations.append(all_durations[i])
             logging.warning(
                 f"Setting the following test cases in run {run_id} to {category}: {test_cases_ids}"
-            )            
+            )
             logging.warning(
                 f"Setting the following test cases {test_cases_ids} to duration {durations}"
             )
@@ -272,7 +272,7 @@ def mark_results(testrail_session: TestRail, test_results):
                 testrail_suite_id=suite_id,
                 test_case_ids=test_cases_ids,
                 status=category,
-                elapsed=durations
+                elapsed=durations,
             )
 
 
@@ -562,7 +562,9 @@ def collect_changes(testrail_session: TestRail, report):
 
     version_str = metadata.get("fx_version")
     plan_title = get_plan_title(version_str, channel)
-    logging.warning(f"Got plan title: {plan_title} from version {version_str} and channel {channel}")
+    logging.warning(
+        f"Got plan title: {plan_title} from version {version_str} and channel {channel}"
+    )
     plan_match = PLAN_NAME_RE.match(plan_title)
     (_, major) = [plan_match[n] for n in range(1, 3)]
     config = metadata.get("machine_config")
@@ -671,15 +673,21 @@ def collect_changes(testrail_session: TestRail, report):
         # Tests reported as rerun are a problem -- we need to know pass/fail
         if outcome == "rerun":
             outcome = test.get("call").get("outcome")
-        duration = test['setup']['duration'] + test['call']['duration'] + test['teardown']['duration']
+        duration = (
+            test["setup"]["duration"]
+            + test["call"]["duration"]
+            + test["teardown"]["duration"]
+        )
         logging.info(f"TC: {test_case}: {outcome} using {duration}s ")
 
         if not results_by_suite.get(suite_id):
             results_by_suite[suite_id] = {}
             durations_by_suite[suite_id] = {}
         results_by_suite[suite_id][test_case] = outcome
         durations_by_suite[suite_id].setdefault(test_case, 0)
-        durations_by_suite[suite_id][test_case] = round(durations_by_suite[suite_id][test_case] + duration, 2)
+        durations_by_suite[suite_id][test_case] = round(
+            durations_by_suite[suite_id][test_case] + duration, 2
+        )
 
         if suite_id != last_suite_id:
             # When we get the last test_case in a suite, add entry, run, results
@@ -695,7 +703,7 @@ def collect_changes(testrail_session: TestRail, report):
                     "config_id": config_id,
                     "cases": cases_in_suite,
                     "results": results_by_suite[last_suite_id],
-                    "durations": durations_by_suite[last_suite_id]
+                    "durations": durations_by_suite[last_suite_id],
                 }
 
                 full_test_results = merge_results(
@@ -716,7 +724,7 @@ def collect_changes(testrail_session: TestRail, report):
         "config_id": config_id,
         "cases": cases_in_suite,
         "results": results_by_suite[last_suite_id],
-        "durations": durations_by_suite[last_suite_id]
+        "durations": durations_by_suite[last_suite_id],
     }
 
     logging.info(f"n run {last_suite_id}, {last_description}")