fix(tests/manifests): enhance run_shell_function to support script and function arguments, update test coverage to reflect changes (#2499)

Author: jiridanek

tests/manifests.py

@@ -276,12 +276,16 @@ def run_shell_function(
         self,
         shell_script_path: Path,
         shell_function_name: str,
-        args: Iterable[str] = (),
+        script_args: Iterable[str] = (),
+        function_args: Iterable[str] = (),
         env: dict[str, str] | None = None,
     ) -> str:
         env = env or {}
+        script_args_str = " ".join(shlex.quote(arg) for arg in script_args)
+        function_args_str = " ".join(shlex.quote(arg) for arg in function_args)
         shell_notebook_id = subprocess.run(
-            f"""source {shell_script_path} && {shell_function_name} {" ".join(shlex.quote(arg) for arg in args)}""",
+            # set temporary positional parameters for the `source`ing
+            f"""set -- {script_args_str} && source {shell_script_path} && set -- && {shell_function_name} {function_args_str}""",
             shell=True,
             executable="/bin/bash",
             env=env,
@@ -300,6 +304,7 @@ def get_targets() -> Generator[tuple[str, Path], None, None]:
         python_311 = gen_gha_matrix_jobs.extract_image_targets(ROOT_DIR, env={"RELEASE_PYTHON_VERSION": "3.11"})
         python_312 = gen_gha_matrix_jobs.extract_image_targets(ROOT_DIR, env={"RELEASE_PYTHON_VERSION": "3.12"})
         targets = python_311 + python_312
+        # TODO(jdanek): this is again duplicating knowledge, but, what can I do?
         expected_manifest_paths = {
             "jupyter-minimal-ubi9-python-3.12": ROOT_DIR / "manifests/base/jupyter-minimal-notebook-imagestream.yaml",
             "runtime-minimal-ubi9-python-3.12": ROOT_DIR / "manifests/base/jupyter-minimal-notebook-imagestream.yaml",
@@ -354,13 +359,15 @@ def test_compare_with_shell_implementation(self, target: str, expected_manifest_
         notebook_id = self.run_shell_function(
             shell_script_path,
             "_get_notebook_id",
+            script_args=[target],
             env={"notebook_workload_name": target},
         )
         assert notebook_id
 
         source_of_truth_filepath = self.run_shell_function(
             shell_script_path,
             "_get_source_of_truth_filepath",
-            [notebook_id],
+            script_args=[target],
+            function_args=[notebook_id],
         )
         assert source_of_truth_filepath == str(expected_manifest_path)