Skip if a category does not exist

Author: whlpatricia

collect_executables.py

@@ -136,8 +136,8 @@ def get_gd_platform():
     else:
         # Anything but devedition
 
-        candidate_exists = True
-        this_beta = BACKSTOP
+        # candidate_exists = True
+        # this_beta = BACKSTOP
         # while candidate_exists:
         #     (major, minor_beta) = this_beta.split(".")
         #     (minor, beta) = minor_beta.split("b")
@@ -146,23 +146,23 @@ def get_gd_platform():
         #     beta = int(beta)
 
         #     next_major = f"{major + 1}.0b1"
-        #     fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_major}-candidates/build1/"
+        #     fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_major}-candidates/"
         #     rs = requests.get(fx_download_dir_url)
         #     if rs.status_code < 300:
         #         latest_beta_ver = next_major
         #         this_beta = next_major
         #         continue
 
         #     next_minor = f"{major}.{minor + 1}b1"
-        #     fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_minor}-candidates/build1/"
+        #     fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_minor}-candidates/"
         #     rs = requests.get(fx_download_dir_url)
         #     if rs.status_code < 300:
         #         latest_beta_ver = next_minor
         #         this_beta = next_minor
         #         continue
 
         #     next_beta = f"{major}.{minor}b{beta + 1}"
-        #     fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_beta}-candidates/build1/"
+        #     fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_beta}-candidates/"
         #     rs = requests.get(fx_download_dir_url)
         #     if rs.status_code < 300:
         #         latest_beta_ver = next_beta
@@ -171,6 +171,7 @@ def get_gd_platform():
 
         #     candidate_exists = False
 
+        # Look for the latest build
         status = 200
         build = 2
         latest_beta_ver = BACKSTOP

modules/testrail_integration.py

@@ -229,10 +229,14 @@ def merge_results(*result_sets) -> dict:
 
 def mark_results(testrail_session: TestRail, test_results):
     """For each type of result, and per run, mark tests to status in batches"""
-    logging.info(f"mark results: object\n{test_results}")
+    logging.warning(f"mark results: object\n{test_results}")
     existing_results = {}
     # don't send update requests for skipped test cases
     for category in ["passed", "blocked", "xfailed", "failed"]:
+        # Skip the category if it doesn't exist
+        if test_results.get(category) is None:
+            logging.warning(category, "does not exist for this test run")
+            continue
         for run_id in test_results[category]:
             if not existing_results.get(run_id):
                 existing_results[run_id] = testrail_session.get_test_results(run_id)