Merge branch 'dev' of https://github.com/autopkg/autopkg into dev

autopkg · Sep 21, 2023 · bd8ef7b · bd8ef7b
2 parents ee66036 + 0fd6d86
commit bd8ef7b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 16 deletions.
diff --git a/Code/autopkg b/Code/autopkg
@@ -1307,9 +1307,7 @@ def find_processor_path(processor_name, recipe, env=None):
             processor_recipe_id,
         ) = extract_processor_name_with_recipe_identifier(processor_name)
         if processor_recipe_id:
-            shared_processor_recipe_path = find_recipe_by_id_in_map(
-                processor_recipe_id
-            )
+            shared_processor_recipe_path = find_recipe_by_id_in_map(processor_recipe_id)
             if shared_processor_recipe_path:
                 processor_search_dirs.append(
                     os.path.dirname(shared_processor_recipe_path)

diff --git a/Code/autopkglib/__init__.py b/Code/autopkglib/__init__.py
@@ -246,7 +246,9 @@ def find_recipe_by_id_in_map(
     return None
 
 
-def find_recipe_by_name_in_map(name: str, skip_overrides: bool = False) -> Optional[str]:
+def find_recipe_by_name_in_map(
+    name: str, skip_overrides: bool = False
+) -> Optional[str]:
     """Search recipe map for a shortname"""
     # Check the overrides first, unless skipping them
     if not skip_overrides and name in globalRecipeMap["overrides"]:
@@ -1066,9 +1068,7 @@ def get_processor(processor_name, verbose=None, recipe=None, env=None):
             processor_recipe_id,
         ) = extract_processor_name_with_recipe_identifier(processor_name)
         if processor_recipe_id:
-            shared_processor_recipe_path = find_recipe_by_id_in_map(
-                processor_recipe_id
-            )
+            shared_processor_recipe_path = find_recipe_by_id_in_map(processor_recipe_id)
             if shared_processor_recipe_path:
                 processor_search_dirs.append(
                     os.path.dirname(shared_processor_recipe_path)

diff --git a/Code/tests/test_autopkglib.py b/Code/tests/test_autopkglib.py
@@ -162,7 +162,9 @@ def setUp(self):
         # This forces autopkglib to accept our patching of memoize
         imp.reload(autopkglib)
         autopkglib.globalPreferences
-        self.mock_recipemap = patch.object(autopkglib, "globalRecipeMap", self.recipe_file_struct)
+        self.mock_recipemap = patch.object(
+            autopkglib, "globalRecipeMap", self.recipe_file_struct
+        )
 
     def tearDown(self):
         pass
@@ -245,16 +247,26 @@ def test_find_recipe_by_name_in_map_override(self, mock_valid):
         """find_recipe_by_name_in_map should return identifier from overrides in map"""
         mock_valid.return_value = True
         with self.mock_recipemap:
-            id = autopkglib.find_recipe_by_name_in_map("GoogleChrome.download", skip_overrides=False)
-            self.assertEqual(id, '/Users/test/Library/AutoPkg/RecipeOverrides/GoogleChrome.download.recipe')
+            id = autopkglib.find_recipe_by_name_in_map(
+                "GoogleChrome.download", skip_overrides=False
+            )
+            self.assertEqual(
+                id,
+                "/Users/test/Library/AutoPkg/RecipeOverrides/GoogleChrome.download.recipe",
+            )
 
     @patch("autopkglib.valid_recipe_file")
     def test_find_recipe_by_name_in_map_no_override(self, mock_valid):
         """find_recipe_by_name_in_map should return identifier from recipe repos in map."""
         mock_valid.return_value = True
         with self.mock_recipemap:
-            id = autopkglib.find_recipe_by_name_in_map("GoogleChrome.download", skip_overrides=True)
-            self.assertEqual(id, "/Users/test/Library/AutoPkg/RecipeRepos/com.github.autopkg.recipes/GoogleChrome/GoogleChrome.download.recipe")
+            id = autopkglib.find_recipe_by_name_in_map(
+                "GoogleChrome.download", skip_overrides=True
+            )
+            self.assertEqual(
+                id,
+                "/Users/test/Library/AutoPkg/RecipeRepos/com.github.autopkg.recipes/GoogleChrome/GoogleChrome.download.recipe",
+            )
 
     @patch("autopkglib.valid_recipe_file")
     def test_find_recipe_by_name_in_map_returns_none_if_missing(self, mock_valid):
@@ -271,16 +283,26 @@ def test_find_recipe_by_id_in_map_override(self, mock_valid):
         """find_recipe_by_id_in_map should return identifier from overrides in map."""
         mock_valid.return_value = True
         with self.mock_recipemap:
-            id = autopkglib.find_recipe_by_id_in_map("local.download.GoogleChrome", skip_overrides=False)
-            self.assertEqual(id, '/Users/test/Library/AutoPkg/RecipeOverrides/GoogleChrome.download.recipe')
+            id = autopkglib.find_recipe_by_id_in_map(
+                "local.download.GoogleChrome", skip_overrides=False
+            )
+            self.assertEqual(
+                id,
+                "/Users/test/Library/AutoPkg/RecipeOverrides/GoogleChrome.download.recipe",
+            )
 
     @patch("autopkglib.valid_recipe_file")
     def test_find_recipe_by_id_in_map_no_override(self, mock_valid):
         """find_recipe_by_id_in_map should return identifier from recipe repos in map."""
         mock_valid.return_value = True
         with self.mock_recipemap:
-            id = autopkglib.find_recipe_by_id_in_map("com.github.autopkg.download.googlechrome", skip_overrides=True)
-            self.assertEqual(id, "/Users/test/Library/AutoPkg/RecipeRepos/com.github.autopkg.recipes/GoogleChrome/GoogleChrome.download.recipe")
+            id = autopkglib.find_recipe_by_id_in_map(
+                "com.github.autopkg.download.googlechrome", skip_overrides=True
+            )
+            self.assertEqual(
+                id,
+                "/Users/test/Library/AutoPkg/RecipeRepos/com.github.autopkg.recipes/GoogleChrome/GoogleChrome.download.recipe",
+            )
 
     @patch("autopkglib.valid_recipe_file")
     def test_find_recipe_by_id_in_map_returns_none_if_missing(self, mock_valid):