reverted tools changes

Author: DougAnsonAustinTX

tools/maintenance.py

@@ -22,7 +22,6 @@
 Test Learning Path
 """
 def check_lp(lp_path, link, debug):
-    test_image_results = None # initialize the variable
     if not os.path.isdir(lp_path):
         lp_path = os.path.dirname(lp_path)
 
@@ -157,13 +156,10 @@ def main():
         if args.stats_report:
             # If all test results are zero, all tests have passed
             patch.patch(args.instructions, results_dict, args.link)
-        if results_dict is not None:
-            if all(results_dict.get(k) for k in results_dict):
-                # Errors exist
-                logging.info("Tests failed in test suite")
-                sys.exit(1)
-        else:
-            pass
+        if all(results_dict.get(k) for k in results_dict):
+            # Errors exist
+            logging.info("Tests failed in test suite")
+            sys.exit(1)
     elif args.spelling:
         logging.info(f"Checking spelling of {args.spelling}")
         output = parse.spelling(args.spelling)

tools/patch.py

@@ -16,7 +16,7 @@ def patch(article_path: str, results: dict, link: str):
     article_path_pure = PurePath(re.sub(r"^.*?content/", "", article_path))
     article_path_parts = list(article_path_pure.parts)
     if "learning-paths" in article_path_parts:
-        content_type, sw_category, content_title, *others_1 = article_path_parts
+        content_type, sw_category, content_title = article_path_parts
         article_path = PurePath(article_path, "_index.md")
     elif "install-guides" in article_path_parts:
         # In case the install guide is in a subdirectory
@@ -30,33 +30,30 @@ def patch(article_path: str, results: dict, link: str):
     else:
         raise SystemExit("Unknown content path, pass learning paths or install guides only")
 
-    if results is not None:
-        test_images = results.keys()
-        results_values = defaultdict(lambda: "failed")
-        results_values[0] = "passed"
+    test_images = results.keys()
+    results_values = defaultdict(lambda: "failed")
+    results_values[0] = "passed"
 
-        content_data = data["sw_categories"][sw_category][content_title]
+    content_data = data["sw_categories"][sw_category][content_title]
 
-        # Create 'tests_and_status' if it doesn't exist
-        if "tests_and_status" not in content_data or not isinstance(content_data["tests_and_status"], list):
-            content_data["tests_and_status"] = [{} for _ in range(len(test_images))]
+    # Create 'tests_and_status' if it doesn't exist
+    if "tests_and_status" not in content_data or not isinstance(content_data["tests_and_status"], list):
+        content_data["tests_and_status"] = [{} for _ in range(len(test_images))]
 
-        # If 'tests_and_status' exists but is too short, extend it
-        if len(content_data["tests_and_status"]) < len(test_images):
-            additional_entries = [{} for _ in range(len(test_images) - len(content_data["tests_and_status"]))]
-            content_data["tests_and_status"].extend(additional_entries)
+    # If 'tests_and_status' exists but is too short, extend it
+    if len(content_data["tests_and_status"]) < len(test_images):
+        additional_entries = [{} for _ in range(len(test_images) - len(content_data["tests_and_status"]))]
+        content_data["tests_and_status"].extend(additional_entries)
 
-        # Now safe to index
-        for i, image in enumerate(test_images):
-            idx = min(i, len(content_data["tests_and_status"]) - 1)
-            content_data["tests_and_status"][idx][image] = results_values[results[image]]
+    # Now safe to index
+    for i, image in enumerate(test_images):
+        idx = min(i, len(content_data["tests_and_status"]) - 1)
+        content_data["tests_and_status"][idx][image] = results_values[results[image]]
 
-        if link:
-            data["sw_categories"][sw_category][content_title]["test_link"] = link
+    if link:
+        data["sw_categories"][sw_category][content_title]["test_link"] = link
 
 
-        with open(stats_file, mode='w') as f:
-            yaml.dump(data, f)
-            f.close()
-    else:
-        pass
+    with open(stats_file, mode='w') as f:
+        yaml.dump(data, f)
+        f.close()