reapplying fix from main 843dedf

Author: AdhamN861

scripts_bazel/merge_sourcelinks.py

@@ -39,7 +39,6 @@ def main():
     )
     _ = parser.add_argument(
         "--known_good",
-        required=True,
         help="Path to a required 'known good' JSON file (provided by Bazel).",
     )
     _ = parser.add_argument(

scripts_bazel/tests/generate_sourcelinks_cli_test.py

@@ -14,14 +14,19 @@
 """Tests for generate_sourcelinks_cli.py"""
 
 import json
-import subprocess
 import sys
 from pathlib import Path
 
+import pytest
+
+import scripts_bazel.generate_sourcelinks_cli
+
 _MY_PATH = Path(__file__).parent
 
 
-def test_generate_sourcelinks_cli_basic(tmp_path: Path) -> None:
+def test_generate_sourcelinks_cli_basic(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
     """Test basic functionality of generate_sourcelinks_cli."""
     # Create a test source file with a traceability tag
     test_file = tmp_path / "test_source.py"
@@ -37,17 +42,19 @@ def some_function():
     output_file = tmp_path / "output.json"
 
     # Execute the script
-    result = subprocess.run(
+    monkeypatch.setattr(
+        sys,
+        "argv",
         [
-            sys.executable,
             _MY_PATH.parent / "generate_sourcelinks_cli.py",
             "--output",
             str(output_file),
             str(test_file),
         ],
     )
+    result = scripts_bazel.generate_sourcelinks_cli.main()
 
-    assert result.returncode == 0
+    assert result == 0
     assert output_file.exists()
 
     # Check the output content

scripts_bazel/tests/merge_sourcelinks_test.py

@@ -14,14 +14,19 @@
 """Tests for merge_sourcelinks.py"""
 
 import json
-import subprocess
 import sys
 from pathlib import Path
 
+import pytest
+
+import scripts_bazel.merge_sourcelinks
+
 _MY_PATH = Path(__file__).parent
 
 
-def test_merge_sourcelinks_basic(tmp_path: Path) -> None:
+def test_merge_sourcelinks_basic(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
     """Test basic merge functionality."""
     # Each sourcelinks JSON starts with a metadata dict followed by need entries
     local_meta = {"repo_name": "local_repo", "hash": "", "url": ""}
@@ -58,26 +63,22 @@ def test_merge_sourcelinks_basic(tmp_path: Path) -> None:
         )
     )
 
-    # known_good.json is required by the script; for local_repo it is never read
-    known_good_file = tmp_path / "known_good.json"
-    known_good_file.write_text(json.dumps({"modules": {}}))
-
     output_file = tmp_path / "merged.json"
 
-    result = subprocess.run(
+    monkeypatch.setattr(
+        sys,
+        "argv",
         [
-            sys.executable,
             _MY_PATH.parent / "merge_sourcelinks.py",
             "--output",
             str(output_file),
-            "--known_good",
-            str(known_good_file),
             str(file1),
             str(file2),
         ],
     )
+    result = scripts_bazel.merge_sourcelinks.main()
 
-    assert result.returncode == 0
+    assert result == 0
     assert output_file.exists()
 
     with open(output_file) as f: